Bump docker-py to 4.0.2, and run tests from upstream repository by thaJeztah · Pull Request #39068 · moby/moby

thaJeztah · 2019-04-13T17:10:18Z

closes #37939
addresses #36415
closes #39239

This removes all the installation steps for docker-py from the
Dockerfile, and instead builds the upstream Dockerfile, and runs
docker-py tests in a container.

To test;

make test-docker-py

...

Removing bundles/

---> Making bundle: dynbinary (in bundles/dynbinary)
Building: bundles/dynbinary-daemon/dockerd-dev
Created binary: bundles/dynbinary-daemon/dockerd-dev

---> Making bundle: test-docker-py (in bundles/test-docker-py)
---> Making bundle: .integration-daemon-start (in bundles/test-docker-py)
Using test binary docker
Starting dockerd
INFO: Waiting for daemon to start...
.
INFO: Building docker-sdk-python3:3.7.0...
sha256:686428ae28479e9b5c8fdad1cadc9b7a39b462e66bd13a7e35bd79c6a152a402
INFO: Starting docker-py tests...
============================= test session starts ==============================
platform linux -- Python 3.6.8, pytest-4.1.0, py-1.8.0, pluggy-0.9.0
rootdir: /src, inifile: pytest.ini
plugins: timeout-1.3.3, cov-2.6.1
collected 359 items

tests/integration/api_build_test.py .......s....
....

relates to docker/docker-py#2310

thaJeztah · 2019-04-13T17:10:46Z

Dockerfile

Need to check if there's other dependencies that were only there for docker-py

@chris-crone any other reps that stand out and might be docker-py specific?

hack/ci/janky

hack/make/test-docker-py

thaJeztah · 2019-04-13T17:13:11Z

hack/make/test-docker-py

Looks like a bug in the 17.06 cli; it fails when using a commit, but passes if I use a tag 🤔

thaJeztah · 2019-04-13T17:59:22Z

Yay, it works 🎉

17:37:53 ======== 348 passed, 5 skipped, 4 xfailed, 2 xpassed in 384.42 seconds ========

codecov · 2019-04-16T15:36:28Z

Codecov Report

❗ No coverage uploaded for pull request base (master@81dbed4). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master   #39068   +/-   ##
=========================================
  Coverage          ?   37.29%           
=========================================
  Files             ?      609           
  Lines             ?    45234           
  Branches          ?        0           
=========================================
  Hits              ?    16870           
  Misses            ?    26069           
  Partials          ?     2295

thaJeztah · 2019-04-16T15:51:15Z

Makefile

Added these, so that they can be passed to the container 🎉

thaJeztah · 2019-04-16T15:54:44Z

Removed "WIP" - I think this is ready for prime-time 🎉

ping @tianon @chris-crone @cpuguy83 PTAL 🤗

hack/make/test-docker-py

thaJeztah · 2019-04-16T21:06:24Z

Looks like some issues with an image we're using in CI:

19:13:43 FAIL: docker_cli_pull_test.go:273: DockerSuite.TestPullWindowsImageFailsOnLinux
19:13:43 
19:13:43 assertion failed: expected error to contain "cannot be used on this platform", got "\nCommand:  /usr/local/cli/docker pull microsoft/nanoserver\nExitCode: 1\nError:    exit status 1\nStdout:   Using default tag: latest\n\nStderr:   Error response from daemon: manifest for microsoft/nanoserver:latest not found: manifest unknown: manifest unknown\n\n\nFailures:\nExitCode was 1 expected 0\nExpected no error"
19:13:45

Error response from daemon: manifest for microsoft/nanoserver:latest not found

thaJeztah · 2019-04-16T21:11:25Z

@tianon thanks! Updated; ptal 🤗

tianon

LGTM 👍

thaJeztah · 2019-04-16T22:26:30Z

@cpuguy83 LGTY?

chris-crone

LGTM

@shin- put up a PR to merge the Dockerfiles for docker-py which will mean that this requires changes. It's not merged yet though.

thaJeztah · 2019-04-17T11:54:31Z

Ah, I see, so it would have to be

-f tests/Dockerfile

instead of

-f Dockerfile-py3

thaJeztah · 2019-04-17T23:32:58Z

rebased to trigger CI

thaJeztah · 2019-04-18T07:10:28Z

01:49:56   Retrying (Retry(total=0, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f9b083c40b8>: Failed to establish a new connection: [Errno -3] Temporary failure in name resolution',)': /simple/appdirs/
01:49:56   Could not find a version that satisfies the requirement appdirs==1.4.3 (from -r requirements.txt (line 1)) (from versions: )
01:49:56 No matching distribution found for appdirs==1.4.3 (from -r requirements.txt (line 1))

thaJeztah · 2019-07-16T13:41:48Z

Windows RS1 is failing to wipe the workspace https://jenkins.dockerproject.org/job/Docker-PRs-WoW-RS1/25913/console

12:36:11 Building remotely on azure-windows-rs1-3 (windows-rs1) in workspace /gopath/src/github.com/docker/docker
12:36:11 No credentials specified
12:36:11 Wiping out workspace first.
12:36:12 jenkins.util.io.CompositeIOException: Unable to delete '\gopath\src\github.com\docker\docker'. Tried 3 times (of a maximum of 3) waiting 0.1 sec between attempts.

tianon

LGTM

thaJeztah · 2019-07-16T15:19:36Z

Boo! Why is it failing again?

14:40:56 W: Failed to fetch http://deb.debian.org/debian/dists/jessie/InRelease  
14:40:56 
14:40:56 W: Failed to fetch http://security.debian.org/debian-security/dists/jessie/updates/InRelease  
14:40:56 
14:40:56 W: Failed to fetch http://deb.debian.org/debian/dists/jessie/Release.gpg  Temporary failure resolving 'deb.debian.org'
14:40:56 
14:40:56 W: Failed to fetch http://security.debian.org/debian-security/dists/jessie/updates/Release.gpg  Temporary failure resolving 'security.debian.org'
14:40:56 
14:40:56 W: Some index files failed to download. They have been ignored, or old ones used instead.

See if networking works if we run it first Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

thaJeztah · 2019-07-16T17:55:24Z

Moved docker-py tests first again to see if the networking issues are because integration tests don't cleanup properly?

thaJeztah · 2019-07-16T18:37:22Z

"YAY" so it passes if we run docker-py first

18:04:32 INFO: Building docker-sdk-python3:4.0.2...
18:14:10 sha256:c32514b539959ddb15e05f7c57552d0ca8d49ba25ac779f89663415c9b90a4c2
18:14:10 INFO: Starting docker-py tests...
18:14:33 ============================= test session starts ==============================
...
18:22:31 

18:22:31 = 367 passed, 10 skipped, 3 deselected, 3 xfailed, 2 xpassed in 477.76 seconds =

and it fails if we run it after test-integration-flaky, test-integration, and cross

andrewhsu

SGTM w.r.t. getting more control over flaky tests

thaJeztah · 2019-07-18T18:49:27Z

I'll update the last commit's title

seemethere · 2019-07-18T19:28:28Z

Does it make sense if we even removed the docker-py tests from this repository completely?

thaJeztah · 2019-07-18T19:35:15Z

@seemethere they have caught API regressions / changes at several occasions, so they can be useful. They should run separately though (I guess can do that once we have the Jenkinsfile up and running)

thaJeztah · 2019-07-18T19:35:58Z

And, possibly, we should just have an image that we pull instead of building here 🤷‍♂

thaJeztah requested a review from tianon as a code owner April 13, 2019 17:10

GordonTheTurtle added the status/0-triage label Apr 13, 2019

thaJeztah added the area/testing label Apr 13, 2019

thaJeztah force-pushed the separate_docker_py branch from 530e3de to 49a7c4a Compare April 13, 2019 17:11

thaJeztah commented Apr 13, 2019

View reviewed changes

thaJeztah mentioned this pull request Apr 13, 2019

[WIP] docker-py: use pip to install dependencies #38526

Closed

thaJeztah force-pushed the separate_docker_py branch from 49a7c4a to a200368 Compare April 16, 2019 15:36

thaJeztah added status/2-code-review and removed status/0-triage labels Apr 16, 2019

thaJeztah commented Apr 16, 2019

View reviewed changes

Makefile Outdated

Copy link
Copy Markdown

Member Author

thaJeztah Apr 16, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added these, so that they can be passed to the container 🎉

thaJeztah changed the title ~~[WIP] Run docker-py tests from upstream repository~~ Run docker-py tests from upstream repository Apr 16, 2019

thaJeztah force-pushed the separate_docker_py branch from a200368 to d2405f5 Compare April 16, 2019 15:52

thaJeztah commented Apr 16, 2019

View reviewed changes

hack/make/test-docker-py Outdated Show resolved Hide resolved

thaJeztah force-pushed the separate_docker_py branch from d2405f5 to 764679f Compare April 16, 2019 18:20

tianon reviewed Apr 16, 2019

View reviewed changes

hack/make/test-docker-py Outdated Show resolved Hide resolved

hack/make/test-docker-py Outdated Show resolved Hide resolved

hack/make/test-docker-py Outdated Show resolved Hide resolved

hack/make/test-docker-py Outdated Show resolved Hide resolved

thaJeztah force-pushed the separate_docker_py branch 3 times, most recently from 00867c8 to ab65a86 Compare April 16, 2019 21:10

tianon approved these changes Apr 16, 2019

View reviewed changes

chris-crone approved these changes Apr 17, 2019

View reviewed changes

thaJeztah force-pushed the separate_docker_py branch from ab65a86 to a29cec8 Compare April 17, 2019 23:32

thaJeztah changed the title ~~[WIP] Bump docker-py to 4.0.2, and run tests from upstream repository~~ Bump docker-py to 4.0.2, and run tests from upstream repository Jul 16, 2019

thaJeztah added the rebuild/windowsRS1 label Jul 16, 2019

GordonTheTurtle removed the rebuild/windowsRS1 label Jul 16, 2019

tianon approved these changes Jul 16, 2019

View reviewed changes

WIP Move docker-py tests first again

6aafe0f

See if networking works if we run it first Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

thaJeztah mentioned this pull request Jul 16, 2019

Add validation for '--network-control-plane-mtu' flag #34409

Open

andrewhsu approved these changes Jul 17, 2019

View reviewed changes

thaJeztah mentioned this pull request Jul 18, 2019

Be more conservative for Windows in TestFrequency for Splunk #39552

Merged

tiborvass approved these changes Jul 18, 2019

View reviewed changes

tiborvass merged commit 7641600 into moby:master Jul 18, 2019

thaJeztah deleted the separate_docker_py branch July 18, 2019 19:23

andrewhsu mentioned this pull request Jul 20, 2019

added hack/ci/master as entry point for master codeline checks #39580

Merged

thaJeztah mentioned this pull request Jul 31, 2019

Dockerfile: add back yamllint #39636

Merged

This was referenced Aug 19, 2019

[19.03 backport] Jenkinsfile and related test-changes docker-archive/engine#328

Merged

[18.09 backport] Jenkinsfile and related test-changes docker-archive/engine#329

Merged

thaJeztah added the process/cherry-picked label Aug 21, 2019

thaJeztah added this to the 20.03.0 milestone Apr 2, 2020

Conversation

thaJeztah commented Apr 13, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

thaJeztah Apr 13, 2019

Choose a reason for hiding this comment

Uh oh!

thaJeztah Apr 16, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

thaJeztah Apr 13, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Apr 13, 2019

Uh oh!

codecov bot commented Apr 16, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

thaJeztah Apr 16, 2019

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Apr 16, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

thaJeztah commented Apr 16, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

thaJeztah commented Apr 16, 2019

Uh oh!

tianon left a comment

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Apr 16, 2019

Uh oh!

chris-crone left a comment

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Apr 17, 2019

Uh oh!

thaJeztah commented Apr 17, 2019

Uh oh!

thaJeztah commented Apr 18, 2019

Uh oh!

thaJeztah commented Jul 16, 2019

Uh oh!

tianon left a comment

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Jul 16, 2019

Uh oh!

thaJeztah commented Jul 16, 2019

Uh oh!

thaJeztah commented Jul 16, 2019

Uh oh!

andrewhsu left a comment

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Jul 18, 2019

Uh oh!

seemethere commented Jul 18, 2019

Uh oh!

thaJeztah commented Jul 18, 2019

Uh oh!

thaJeztah commented Jul 18, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

thaJeztah commented Apr 13, 2019 •

edited

Loading

thaJeztah Apr 13, 2019 •

edited

Loading

codecov bot commented Apr 16, 2019 •

edited

Loading

thaJeztah commented Apr 16, 2019 •

edited

Loading