Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[19.03 backport] Testing and Jenkinsfile changes [step 1] #382

Merged
merged 59 commits into from
Sep 26, 2019

Commits on Sep 25, 2019

  1. Integration: remove unneeded platform check for IPVLAN tests

    These tests require a local daemon, and are not built on Windows
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 1e4bd26)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    c953304 View commit details
    Browse the repository at this point in the history
  2. Integration: remove "experimental" option for IPVLAN test-daemons

    IPVLAN no longer is experimental since 3ab093d,
    so there's no need to set this option.
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit dae9bac)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    0c8bc0b View commit details
    Browse the repository at this point in the history
  3. Integration: IPVlan add missing import comment

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 93b2867)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    0378afa View commit details
    Browse the repository at this point in the history
  4. Integration: exclude IPVlan test-suite on Windows

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 4060a70)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    1710bba View commit details
    Browse the repository at this point in the history
  5. Integration: remove redundant kernel version check for MACVlan

    The daemon requires kernel 3.10 or up to start, so there's no need
    to check if the daemon is kernel 3.8 or up.
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 691eb14)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    8c8de17 View commit details
    Browse the repository at this point in the history
  6. Integration: MACVlan add missing import comment and build-tag

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 316e166)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    edeff03 View commit details
    Browse the repository at this point in the history
  7. integration-cli: remove ExecSupport check

    All current versions of Docker support exec, so no need
    to check for this.
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 7204341)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    f76cb3e View commit details
    Browse the repository at this point in the history
  8. integration-cli: remove defaultSleepImage constant

    Both Linux and Windows now use busybox, so no need to keep a
    constant for this.
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 27f432c)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    a63a02f View commit details
    Browse the repository at this point in the history
  9. integration-cli: remove unused requirements utils

    Removes some test functions that were unused:
    
    - bridgeNfIP6tables
    - ambientCapabilities (added to support moby#26979, which was reverted in moby#27737)
    - overlay2Supported
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit c887b09)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    e286096 View commit details
    Browse the repository at this point in the history
  10. Add (hidden) flags to set containerd namespaces

    This allows our tests, which all share a containerd instance, to be a
    bit more isolated by setting the containerd namespaces to the generated
    daemon ID's rather than the default namespaces.
    
    This came about because I found in some cases we had test daemons
    failing to start (really very slow to start) because it was (seemingly)
    processing events from other tests.
    
    Signed-off-by: Brian Goff <[email protected]>
    (cherry picked from commit 24ad2f4)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    cpuguy83 authored and thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    3441811 View commit details
    Browse the repository at this point in the history
  11. integration: fix cleanup of raft data

    The directory used for storage was either changed or new directories
    were added.
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 6a64a4d)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    ad8327f View commit details
    Browse the repository at this point in the history
  12. Don't log test initial test daemon ping failures

    This is just noise due to timing. I picked `> 2` just based on
    logs from tests I've seen there's always 1 or 2.
    
    Signed-off-by: Brian Goff <[email protected]>
    (cherry picked from commit 15675e2)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    cpuguy83 authored and thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    05c096a View commit details
    Browse the repository at this point in the history
  13. Fix Microsecond -> Milisecond.

    A bit too quick on the trigger on some text completion I think...
    
    Signed-off-by: Brian Goff <[email protected]>
    (cherry picked from commit 5d81821)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    cpuguy83 authored and thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    eeeb2e9 View commit details
    Browse the repository at this point in the history
  14. DockerSwarmSuite lock portIndex to work around race

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit c096225)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    bf212c5 View commit details
    Browse the repository at this point in the history
  15. Be more conservative for Windows in TestFrequency for Splunk

    Signed-off-by: Deep Debroy <[email protected]>
    (cherry picked from commit a5c420a)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    ddebroy authored and thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    7e76438 View commit details
    Browse the repository at this point in the history
  16. integration: run build session tests on non-experimental

    The session endpoint is no longer experimental since
    01c9e70, so we don't
    need to start an experimental daemon.
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit becd29c)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    1d795b5 View commit details
    Browse the repository at this point in the history
  17. integration-cli: increase healthcheck timeout

    Signed-off-by: Tonis Tiigi <[email protected]>
    (cherry picked from commit 8c93628)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    tonistiigi authored and thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    1204f3a View commit details
    Browse the repository at this point in the history
  18. Retry service updates on out of sequence errors

    Code retrying service update operations when receiving "update out of
    sequence" errors was removed because of a misunderstanding, which has
    made tests flaky. This re-adds the "CmdRetryOutOfSequence" method, and
    uses it in TestSwarmPublishAdd to avoid flaky behavior.
    
    Signed-off-by: Drew Erny <[email protected]>
    (cherry picked from commit 1de9146)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    dperny authored and thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    2ebfdfd View commit details
    Browse the repository at this point in the history
  19. integration-cli: remove redundant "testrequires"

    The `DockerDaemonSuite.SetUpTest` already checks for Linux and a local daemon;
    
    ```
    func (s *DockerDaemonSuite) SetUpTest(c *check.C) {
    	testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon)
    	s.d = daemon.New(c, dockerBinary, dockerdBinary, testdaemon.WithEnvironment(testEnv.Execution))
    }
    ```
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 7f37d99)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    a768bf8 View commit details
    Browse the repository at this point in the history
  20. Better logging for swarm tests

    Call helper for starting swarm agents and add some logging with daemon
    id's when joining the swarm.
    
    Signed-off-by: Brian Goff <[email protected]>
    (cherry picked from commit b0fe0df)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    cpuguy83 authored and thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    24395d5 View commit details
    Browse the repository at this point in the history
  21. hack: Remove inContainer check, it wasn't useful

    The inContainer check isn't really useful anymore.
    
    Even though it was said that we shouldn't rely on its existence back in
    2016, we're now in 2019 and this thing still exists so we should just
    rely on it now to check whether or not we're in a container.
    
    Signed-off-by: Eli Uriegas <[email protected]>
    (cherry picked from commit f5cd8fd)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    seemethere authored and thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    3163908 View commit details
    Browse the repository at this point in the history
  22. fix some spelling mistakes

    Signed-off-by: SataQiu <[email protected]>
    (cherry picked from commit f6226a2)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    SataQiu authored and thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    1da2e90 View commit details
    Browse the repository at this point in the history
  23. integration: simplify parallel run destination

    'Namespace' parallel runs by bind-mounting a different directory
    in the container, instead of making the tests running inside
    the container aware of the namespaced location.
    
    This makes it transparent to the tests, and slightly reduces
    complexity.
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 3262a69)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    14d561e View commit details
    Browse the repository at this point in the history
  24. integration: use gotestsum to generate junit.xml and go-test-report.json

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit f3be6b3)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    517ebe6 View commit details
    Browse the repository at this point in the history
  25. integration: test2json: enable timestamps to fix zero-time test durat…

    …ions
    
    Without these options set, test2json does not include a `Time`
    field in the generated JSON;
    
        {"Action":"run","Test":"TestCgroupNamespacesBuild"}
        {"Action":"output","Test":"TestCgroupNamespacesBuild","Output":"=== RUN   TestCgroupNamespacesBuild\n"}
        {"Action":"output","Test":"TestCgroupNamespacesBuild","Output":"--- PASS: TestCgroupNamespacesBuild (1.70s)\n"}
        ...
        {"Action":"pass","Test":"TestCgroupNamespacesBuild"}
    
    As a result, `gotestsum` was not able to calculate test-duration, and
    reported `time="0.000000"` for all tests;
    
        <testcase classname="amd64.integration.build" name="TestCgroupNamespacesBuild" time="0.000000"></testcase>
    
    With this patch applied:
    
        {"Time":"2019-08-23T22:42:41.644361357Z","Action":"run","Package":"amd64.integration.build","Test":"TestCgroupNamespacesBuild"}
        {"Time":"2019-08-23T22:42:41.644367647Z","Action":"output","Package":"amd64.integration.build","Test":"TestCgroupNamespacesBuild","Output":"=== RUN   TestCgroupNamespacesBuild\n"}
        {"Time":"2019-08-23T22:42:44.926933252Z","Action":"output","Package":"amd64.integration.build","Test":"TestCgroupNamespacesBuild","Output":"--- PASS: TestCgroupNamespacesBuild (3.28s)\n"}
        ...
        {"Time":"2019-08-23T22:42:44.927003836Z","Action":"pass","Package":"amd64.integration.build","Test":"TestCgroupNamespacesBuild","Elapsed":3.28}
    
    Which now correctly reports the test's duration:
    
        <testcase classname="amd64.integration.build" name="TestCgroupNamespacesBuild" time="3.280000"></testcase>
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit d2e00d6)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    48e8f18 View commit details
    Browse the repository at this point in the history
  26. integration: improve package- and filename for junit.xml

    Generate more unique names, based on architecture and test-suite name.
    
    Clean up the path to this integration test to create a useful package name.
    "$dir" can be either absolute (/go/src/github.com/docker/docker/integration/foo)
    or relative (./integration/foo). To account for both, first we strip the
    absolute path, then any leading periods and slashes.
    
    For the package-name, we use periods as separator instead of slashes, to be more
    in-line with Java package names (which is what junit.xml was originally designed
    for).
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit f007b01)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    5d4f5db View commit details
    Browse the repository at this point in the history
  27. Jenkinsfile: add TESTDEBUG

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit d723643)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    08573e2 View commit details
    Browse the repository at this point in the history
  28. Dockerfile: update CRIU to v3.12

    New features
    
    - build CRIU with Android NDK
    - C/R of
      - IP RAW sockets
      - lsm: dump and restore any SELinux process label
      - support restoring ghost files on readonly mounts
    
    Bugfixes
    
     - Do not lock network if running in the host network namespace
    - Fix RPC configuration file handling
    - util: don't leak file descriptors to third-party tools
    - small fixes here and there
    
    Improvements
    
    - travis: switch to the Ubuntu Xenial
    - travis-ci: Enable ia32 tests
    - Many improvements and bug fixes in the libcriu
      - Changes in the API and ABI (SONAME increased from 1 to 2)
    
    full diff: checkpoint-restore/criu@v3.11...v3.12
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 00ad022)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    b8b8bcb View commit details
    Browse the repository at this point in the history
  29. Fix testcase name

    TestBuildMulitStageResetScratch testcase was actually meant to be
    TestBuildMulitStageResetScratch
    
    Signed-off-by: Vitaly Ostrosablin <[email protected]>
    (cherry picked from commit c266d8f)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    ostrosablin authored and thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    6d7d877 View commit details
    Browse the repository at this point in the history
  30. pkg/term: refactor TestEscapeProxyRead

    - use subtests to make it clearer what the individual test-cases
      are, and to prevent tests from depending on values set by the
      previous test(s).
    - remove redundant messages in assert (gotest.tools already prints
      a useful message if assertions fail).
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 556d26c)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    79e5950 View commit details
    Browse the repository at this point in the history
  31. integration: windows.ps1: turn defender error into a warning

    Some integration tests are known to fail if Windows Defender is
    enabled. On the machines that run our CI, defender is disabled
    for that reason.
    
    Contributors likely will have defender enabled, and because of
    that are currently not able to run the integration tests.
    
    This patch changes the ERROR into a WARNING, so that contributors
    can still run (a limited set of) the integration tests, but get
    informed that some may fail.
    
    We should make this requirement more specific, and only skip
    tests that are known to require defender to be disabled, but
    while that's not yet in place, let's print a warning instead.
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 3188518)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    1d91898 View commit details
    Browse the repository at this point in the history
  32. TestDispatch: refactor to use subtests again, and fix linting (struct…

    …check)
    
    Instead of using a `initDispatchTestCases()` function, declare the test-table
    inside `TestDispatch` itself, and run the tests as subtests.
    
    ```
    [2019-08-27T15:14:51.072Z] builder/dockerfile/evaluator_test.go:18:2: `name` is unused (structcheck)
    [2019-08-27T15:14:51.072Z] 	name, expectedError string
    ```
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit a3f9cb5)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    45f49fe View commit details
    Browse the repository at this point in the history
  33. integration-cli: getContainerCount() fix trimming prefix

    caught by staticcheck:
    
    ```
    integration-cli/docker_utils_test.go:66:29: SA1024: cutset contains duplicate characters (staticcheck)
    ```
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 02c9b06)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    e8e2666 View commit details
    Browse the repository at this point in the history
  34. Fix docker inspect for dutimgVersion

    Signed-off-by: Stefan Scherer <[email protected]>
    (cherry picked from commit 52a53e2)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    StefanScherer authored and thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    93b38b8 View commit details
    Browse the repository at this point in the history
  35. hack/make/binary-daemon: fix some linting issues

    - Add quotes to prevent word splitting in `cp` statement (SC2046)
    - Replace legacy back tics with `$()`
    - Replace `which` with `command -v` (SC2230)
    - Fix incorrect (`==`) comparison
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 70d3677)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    69da36f View commit details
    Browse the repository at this point in the history
  36. integration-cli: fix some bashism's in Dockerfiles

    `TestBuildBuildTimeArgEnv` and `TestBuildBuildTimeArgEmptyValVariants` were
    using non-standard comparisons.
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit dbde478)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    ae7858f View commit details
    Browse the repository at this point in the history
  37. TestBuildSquashParent: fix non-standard comparisson

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 32f1c65)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    24181cd View commit details
    Browse the repository at this point in the history
  38. docker-py: skip flaky AttachContainerTest::test_attach_no_stream

    Seen failing a couple of times:
    
    ```
    [2019-09-02T08:40:15.796Z] =================================== FAILURES ===================================
    [2019-09-02T08:40:15.796Z] __________________ AttachContainerTest.test_attach_no_stream ___________________
    [2019-09-02T08:40:15.796Z] tests/integration/api_container_test.py:1250: in test_attach_no_stream
    [2019-09-02T08:40:15.796Z]     assert output == 'hello\n'.encode(encoding='ascii')
    [2019-09-02T08:40:15.796Z] E   AssertionError: assert b'' == b'hello\n'
    [2019-09-02T08:40:15.796Z] E     Right contains more items, first extra item: 104
    [2019-09-02T08:40:15.796Z] E     Use -v to get the full diff
    ```
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit ce77a80)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    b116452 View commit details
    Browse the repository at this point in the history
  39. TestCase: use icmd.RunCmd instead icmd.StartCmd

    Use `cli.Docker` instead `dockerCmdWithResult`.
    
    Signed-off-by: Jintao Zhang <[email protected]>
    (cherry picked from commit e6fce00)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    tao12345666333 authored and thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    d588295 View commit details
    Browse the repository at this point in the history
  40. hack/ci/windows.ps1: explicitly set exit code to result of tests

    Trying to see if this helps with the cleanup step exiting in CI, but
    Jenkins continuing to wait for the script to end afterwards.
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 8e8c52c)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    4329550 View commit details
    Browse the repository at this point in the history
  41. hack/ci/windows.ps1 print all environment variables to check how Jenk…

    …ins runs this script
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 7eb522a)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    ff26a23 View commit details
    Browse the repository at this point in the history
  42. Jenkinsfile: create bundles for Windows stages

    CI already stores the logs of the test daemon, so we might as well
    store them as artifacts
    
    ```
    [2019-09-03T12:49:39.835Z] INFO: Tidying up at end of run
    [2019-09-03T12:49:39.835Z] INFO: Saving daemon under test log (d:\CI-2\CI-3593e7622\dut.out) to C:\windows\TEMP\CIDUT.out
    [2019-09-03T12:49:39.835Z] INFO: Saving daemon under test log (d:\CI-2\CI-3593e7622\dut.err) to C:\windows\TEMP\CIDUT.err
    ```
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 6ee61f5)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    a365f07 View commit details
    Browse the repository at this point in the history
  43. Jenkinsfile: Windows: enabled debug-mode for daemon under test

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 1fbadd7)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    e101935 View commit details
    Browse the repository at this point in the history
  44. Jenkinsfile hack for auto-cancellation.

    This change will cause Jenkins to only build the
    latest HEAD of a PR branch, cancelling any
    previous builds that may already be in progress.
    This will decrease feedback time and help mitigate
    resource contention.
    
    Signed-off-by: Peter Salvatore <[email protected]>
    (cherry picked from commit 85bcc52)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    psftw authored and thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    5d74bd7 View commit details
    Browse the repository at this point in the history
  45. integration-cli: update TestCreateWithWorkdir for Hyper-V isolation

    Hyper-V isolated containers do not allow file-operations on a
    running container. This test currently uses `docker cp` to verify
    that the WORKDIR was automatically created, which cannot be done
    while the container is running.
    
    ```
    FAIL: docker_cli_create_test.go:302: DockerSuite.TestCreateWithWorkdir
    
    assertion failed:
    Command:  d:\CI-7\CI-f3768a669\binary\docker.exe cp foo:c:\home\foo\bar c:\tmp
    ExitCode: 1
    Error:    exit status 1
    Stdout:
    Stderr:   Error response from daemon: filesystem operations against a running Hyper-V container are not supported
    
    Failures:
    ExitCode was 1 expected 0
    Expected no error
    ```
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit ac9ef84)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    a163856 View commit details
    Browse the repository at this point in the history
  46. hack/ci/windows.ps1: add support for DOCKER_STORAGE_OPTS

    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit b6f596c)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    b9f2e88 View commit details
    Browse the repository at this point in the history
  47. hack/ci/windows.ps1: stop tailing logs after stopping the daemon

    There's already a step in  "Nuke Everything", but lets' stop it
    after stopping the daemon as well
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit e1636ad)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    d53f67b View commit details
    Browse the repository at this point in the history
  48. Dockerfile.windows: trim .0 from Go versions

    This was an oversight when changing the Dockerfile to use a build-arg;
    the Windows Dockerfile downloads the Go binaries, which never have a
    trailing `.0`.
    
    This patch makes sure that the trailing zero (if any) is removed.
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit c5bd6e3)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    884551a View commit details
    Browse the repository at this point in the history
  49. hack/ci/windows.ps1: fix Go version check (due to trailing .0)

    The Windows Dockerfile downloads the Go binaries, which (unlike
    the Golang images) do not have a trailing `.0` in their version.
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 61450a6)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    6fdd837 View commit details
    Browse the repository at this point in the history
  50. integration: TestInspect(): use swarm.RunningTasksCount

    Instead of using the locally crafted `serviceContainerCount()` utility
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit f874f8b)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    0459d8c View commit details
    Browse the repository at this point in the history
  51. Fix Service TTY test so signal handlers work

    Noticed this test container not exiting correctly while debugging
    another issue. Before this change, signals were being eaten by bash, now
    they are hanlded by top. This cuts the test time in half since it
    doesn't have to wait for docker to SIGKILL it.
    
    Old:
    PASS: docker_cli_swarm_test.go:840: DockerSwarmSuite.TestSwarmServiceTTY	18.997s
    
    New:
    PASS: docker_cli_swarm_test.go:840: DockerSwarmSuite.TestSwarmServiceTTY	6.293s
    
    Signed-off-by: Brian Goff <[email protected]>
    (cherry picked from commit e6c5563)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    cpuguy83 authored and thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    eba485a View commit details
    Browse the repository at this point in the history
  52. integration-cli: swarm.RestartNode(); don't load busybox again

    The daemon was already created and started with the busybox
    image loaded, so there's no need to load the image again.
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 8fc2358)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    55aadb3 View commit details
    Browse the repository at this point in the history
  53. integration-cli: add daemon.StartNodeWithBusybox function

    Starting the daemon should not load the busybox image again
    in most cases, so add a new `StartNodeWithBusybox` function
    to be clear that this one loads the busybox image, and use
    `StartNode()` for cases where loading the busybox image is
    not needed.
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit ead3f4e)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    c2b84fd View commit details
    Browse the repository at this point in the history
  54. Windows: skip flaky TestLogBlocking

    This test frequently fails on Windows RS1 (mainly), so skipping it
    for now on Windows;
    
    ```
    ok  	github.com/docker/docker/daemon/logger	0.525s	coverage: 43.0% of statements
    time="2019-09-09T20:37:35Z" level=info msg="Trying to get region from EC2 Metadata"
    time="2019-09-09T20:37:36Z" level=info msg="Log stream already exists" errorCode=ResourceAlreadyExistsException logGroupName= logStreamName= message= origError="<nil>"
    --- FAIL: TestLogBlocking (0.02s)
        cloudwatchlogs_test.go:313: Expected to be able to read from stream.messages but was unable to
    time="2019-09-09T20:37:36Z" level=error msg=Error
    time="2019-09-09T20:37:36Z" level=error msg="Failed to put log events" errorCode=InvalidSequenceTokenException logGroupName=groupName logStreamName=streamName message="use token token" origError="<nil>"
    time="2019-09-09T20:37:36Z" level=error msg="Failed to put log events" errorCode=DataAlreadyAcceptedException logGroupName=groupName logStreamName=streamName message="use token token" origError="<nil>"
    time="2019-09-09T20:37:36Z" level=info msg="Data already accepted, ignoring error" errorCode=DataAlreadyAcceptedException logGroupName=groupName logStreamName=streamName message="use token token"
    FAIL
    coverage: 78.2% of statements
    FAIL	github.com/docker/docker/daemon/logger/awslogs	0.630s
    ```
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 6c75c86)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    de3a04a View commit details
    Browse the repository at this point in the history
  55. Dockerfile: remove GOMETALINTER_OPTS

    This `ENV` was added to the Dockerfile in b96093f,
    when the repository used per-architecture Dockerfiles, and some architectures needed
    a different configuration.
    
    Now that we use a multi-arch Dockerfile, and CI uses a Jenkinsfile, we can remove
    this `ENV` from the Dockerfile, and set it in CI instead if needed.
    
    Also updated the wording and fixed linting issues in hack/validate/gometalinter
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit a464a3d)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    06cca53 View commit details
    Browse the repository at this point in the history
  56. integration-cli: Skip TestAPIImagesSaveAndLoad on RS3 and older

    I've seen this test fail a number of times recently on RS1
    
    Looking at failures, the test is taking a long time ro run (491.77s, which is
    more than 8 minutes), so perhaps it's just too slow on RS1, which may be
    because we switch to a different base image, or because we're now running
    on different machines.
    
    Compared to RS5 (still slow, but a lot faster);
    
    ```
    --- PASS: Test/DockerSuite/TestAPIImagesSaveAndLoad (146.25s)
    ```
    
    ```
     --- FAIL: Test/DockerSuite/TestAPIImagesSaveAndLoad (491.77s)
         cli.go:45: assertion failed:
             Command:  d:\CI-5\CI-93d2cf881\binary\docker.exe inspect --format {{.Id}} sha256:69e7c1ff23be5648c494294a3808c0ea3f78616fad67bfe3b10d3a7e2be5ff02
             ExitCode: 1
             Error:    exit status 1
             Stdout:
    
             Stderr:   Error: No such object: sha256:69e7c1ff23be5648c494294a3808c0ea3f78616fad67bfe3b10d3a7e2be5ff02
    
             Failures:
             ExitCode was 1 expected 0
             Expected no error
    ```
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    (cherry picked from commit 5adaf52)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    35e9ee8 View commit details
    Browse the repository at this point in the history
  57. Zap a fixed folder, add build number to folder inside

    Signed-off-by: Stefan Scherer <[email protected]>
    (cherry picked from commit 4866207)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    StefanScherer authored and thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    168e23a View commit details
    Browse the repository at this point in the history
  58. awslogs: fix flaky TestLogBlocking unit test

    TestLogBlocking is intended to test that the Log method blocks by
    default.  It does this by mocking out the internals of the
    awslogs.logStream and replacing one of its internal channels with one
    that is controlled by the test.  The call to Log occurs inside a
    goroutine.  Go may or may not schedule the goroutine immediately and the
    blocking may or may not be observed outside the goroutine immediately
    due to decisions made by the Go runtime.  This change adds a small
    timeout for test failure so that the Go runtime has the opportunity to
    run the goroutine before the test fails.
    
    Signed-off-by: Samuel Karp <[email protected]>
    (cherry picked from commit fd94bae)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    samuelkarp authored and thaJeztah committed Sep 25, 2019
    Configuration menu
    Copy the full SHA
    183cac2 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2019

  1. Jenkinsfile: move integration step cleanup to amd64 where it was inte…

    …nded to be
    
    Signed-off-by: Tibor Vass <[email protected]>
    (cherry picked from commit f3d8b8a)
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    Tibor Vass authored and thaJeztah committed Sep 26, 2019
    Configuration menu
    Copy the full SHA
    dfadf72 View commit details
    Browse the repository at this point in the history