@@ -36,7 +36,7 @@ RUN sed -ri "s/(httpredir|deb).debian.org/${APT_MIRROR:-deb.debian.org}/g" /etc/

 FROM base AS criu

 ARG DEBIAN_FRONTEND

 # Install CRIU for checkpoint/restore support

-ENV CRIU_VERSION 3.11

+ENV CRIU_VERSION 3.12

 # Install dependency packages specific to criu

 RUN apt-get update && apt-get install -y --no-install-recommends \

 	libnet-dev \

@@ -281,8 +281,6 @@ COPY --from=djs55/vpnkit@sha256:e508a17cfacc8fd39261d5b4e397df2b953690da577e2c98

 ENV PATH=/usr/local/cli:$PATH

 ENV DOCKER_BUILDTAGS apparmor seccomp selinux

-# Options for hack/validate/gometalinter

-ENV GOMETALINTER_OPTS="--deadline=2m"

 WORKDIR /go/src/github.com/docker/docker

 VOLUME /var/lib/docker

 # Wrap all commands in the "docker-in-docker" script to allow nested containers

@@ -214,7 +214,8 @@ RUN `

   Download-File $location C:\gitsetup.zip; `

   `

   Write-Host INFO: Downloading go...; `

-  Download-File $('https://golang.org/dl/go'+$Env:GO_VERSION+'.windows-amd64.zip') C:\go.zip; `

+  $dlGoVersion=$Env:GO_VERSION -replace '\.0$',''; `

+  Download-File "https://golang.org/dl/go${dlGoVersion}.windows-amd64.zip" C:\go.zip; `

   `

   Write-Host INFO: Downloading compiler 1 of 3...; `

   Download-File https://raw.githubusercontent.com/jhowardmsft/docker-tdmgcc/master/gcc.zip C:\gcc.zip; `

@@ -22,15 +22,27 @@ pipeline {

         DOCKER_GRAPHDRIVER  = 'overlay2'

         APT_MIRROR          = 'cdn-fastly.deb.debian.org'

         CHECK_CONFIG_COMMIT = '78405559cfe5987174aa2cb6463b9b2c1b917255'

+        TESTDEBUG           = '0'

         TIMEOUT             = '120m'

     }

     stages {

+        stage('pr-hack') {

+            when { changeRequest() }

+            steps {

+                script {

+                    echo "Workaround for PR auto-cancel feature. Borrowed from https://issues.jenkins-ci.org/browse/JENKINS-43353"

+                    def buildNumber = env.BUILD_NUMBER as int

+                    if (buildNumber > 1) milestone(buildNumber - 1)

+                    milestone(buildNumber)

+                }

+            }

+        }

         stage('DCO-check') {

             when {

                 beforeAgent true

                 expression { !params.skip_dco }

             }

-            agent { label 'linux' }

+            agent { label 'amd64 && ubuntu-1804 && overlay2' }

             steps {

                 sh '''

                 docker run --rm \

@@ -257,13 +269,13 @@ pipeline {

                                 run_tests() {

                                         [ -n "$TESTDEBUG" ] && rm= || rm=--rm;

                                         docker run $rm -t --privileged \

-                                          -v "$WORKSPACE/bundles:/go/src/github.com/docker/docker/bundles" \

+                                          -v "$WORKSPACE/bundles/${TEST_INTEGRATION_DEST}:/go/src/github.com/docker/docker/bundles" \

+                                          -v "$WORKSPACE/bundles/dynbinary-daemon:/go/src/github.com/docker/docker/bundles/dynbinary-daemon" \

                                           -v "$WORKSPACE/.git:/go/src/github.com/docker/docker/.git" \

                                           --name "$CONTAINER_NAME" \

                                           -e KEEPBUNDLE=1 \

                                           -e TESTDEBUG \

                                           -e TESTFLAGS \

-                                          -e TEST_INTEGRATION_DEST \

                                           -e TEST_SKIP_INTEGRATION \

                                           -e TEST_SKIP_INTEGRATION_CLI \

                                           -e DOCKER_GITCOMMIT=${GIT_COMMIT} \

@@ -308,6 +320,11 @@ pipeline {

                                 exit $c

                                 '''

                             }

+                            post {

+                                always {

+                                    junit testResults: 'bundles/**/*-report.xml', allowEmptyResults: true

+                                }

+                            }

                         }

                     }

@@ -315,7 +332,8 @@ pipeline {

                         always {

                             sh '''

                             echo "Ensuring container killed."

-                            docker rm -vf docker-pr$BUILD_NUMBER || true

+                            cids=$(docker ps -aq -f name=docker-pr${BUILD_NUMBER}-*)

+                            [ -n "$cids" ] && docker rm -vf $cids || true

                             '''

                             sh '''

@@ -328,7 +346,7 @@ pipeline {

                                 bundleName=amd64

                                 echo "Creating ${bundleName}-bundles.tar.gz"

                                 # exclude overlay2 directories

-                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz

+                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*-report.json' -o -name '*.log' -o -name '*.prof' -o -name '*-report.xml' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz

                                 '''

                                 archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true

@@ -397,6 +415,7 @@ pipeline {

                                   -e DOCKER_EXPERIMENTAL \

                                   -e DOCKER_GITCOMMIT=${GIT_COMMIT} \

                                   -e DOCKER_GRAPHDRIVER \

+                                  -e TESTDEBUG \

                                   -e TEST_SKIP_INTEGRATION_CLI \

                                   -e TIMEOUT \

                                   docker:${GIT_COMMIT} \

@@ -405,6 +424,11 @@ pipeline {

                                     test-integration

                                 '''

                             }

+                            post {

+                                always {

+                                    junit testResults: 'bundles/**/*-report.xml', allowEmptyResults: true

+                                }

+                            }

                         }

                     }

@@ -425,7 +449,7 @@ pipeline {

                                 bundleName=s390x-integration

                                 echo "Creating ${bundleName}-bundles.tar.gz"

                                 # exclude overlay2 directories

-                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz

+                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*-report.json' -o -name '*.log' -o -name '*.prof' -o -name '*-report.xml' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz

                                 '''

                                 archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true

@@ -483,6 +507,11 @@ pipeline {

                                     test-integration

                                 '''

                             }

+                            post {

+                                always {

+                                    junit testResults: 'bundles/**/*-report.xml', allowEmptyResults: true

+                                }

+                            }

                         }

                     }

@@ -503,7 +532,7 @@ pipeline {

                                 bundleName=s390x-integration-cli

                                 echo "Creating ${bundleName}-bundles.tar.gz"

                                 # exclude overlay2 directories

-                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz

+                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*-report.json' -o -name '*.log' -o -name '*.prof' -o -name '*-report.xml' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz

                                 '''

                                 archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true

@@ -570,6 +599,7 @@ pipeline {

                                   -e DOCKER_EXPERIMENTAL \

                                   -e DOCKER_GITCOMMIT=${GIT_COMMIT} \

                                   -e DOCKER_GRAPHDRIVER \

+                                  -e TESTDEBUG \

                                   -e TEST_SKIP_INTEGRATION_CLI \

                                   -e TIMEOUT \

                                   docker:${GIT_COMMIT} \

@@ -578,6 +608,11 @@ pipeline {

                                     test-integration

                                 '''

                             }

+                            post {

+                                always {

+                                    junit testResults: 'bundles/**/*-report.xml', allowEmptyResults: true

+                                }

+                            }

                         }

                     }

@@ -598,7 +633,7 @@ pipeline {

                                 bundleName=ppc64le-integration

                                 echo "Creating ${bundleName}-bundles.tar.gz"

                                 # exclude overlay2 directories

-                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz

+                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*-report.json' -o -name '*.log' -o -name '*.prof' -o -name '*-report.xml' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz

                                 '''

                                 archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true

@@ -654,6 +689,11 @@ pipeline {

                                     test-integration

                                 '''

                             }

+                            post {

+                                always {

+                                    junit testResults: 'bundles/**/*-report.xml', allowEmptyResults: true

+                                }

+                            }

                         }

                     }

@@ -662,8 +702,6 @@ pipeline {

                             sh '''

                             echo "Ensuring container killed."

                             docker rm -vf docker-pr$BUILD_NUMBER || true

-                            cids=$(docker ps -aq -f name=docker-pr${BUILD_NUMBER}-*)

-                            [ -n "$cids" ] && docker rm -vf $cids || true

                             '''

                             sh '''

@@ -676,7 +714,7 @@ pipeline {

                                 bundleName=ppc64le-integration-cli

                                 echo "Creating ${bundleName}-bundles.tar.gz"

                                 # exclude overlay2 directories

-                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz

+                                find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*-report.json' -o -name '*.log' -o -name '*.prof' -o -name '*-report.xml' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz

                                 '''

                                 archiveArtifacts artifacts: '*-bundles.tar.gz', allowEmptyArchive: true

@@ -699,11 +737,12 @@ pipeline {

                     }

                     environment {

                         DOCKER_BUILDKIT        = '0'

+                        DOCKER_DUT_DEBUG       = '1'

                         SKIP_VALIDATION_TESTS  = '1'

                         SOURCES_DRIVE          = 'd'

                         SOURCES_SUBDIR         = 'gopath'

                         TESTRUN_DRIVE          = 'd'

-                        TESTRUN_SUBDIR         = "CI-$BUILD_NUMBER"

+                        TESTRUN_SUBDIR         = "CI"

                         WINDOWS_BASE_IMAGE     = 'mcr.microsoft.com/windows/servercore'

                         WINDOWS_BASE_IMAGE_TAG = 'ltsc2016'

                     }

@@ -732,6 +771,25 @@ pipeline {

                             }

                         }

                     }

+                    post {

+                        always {

+                            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE', message: 'Failed to create bundles.tar.gz') {

+                                powershell '''

+                                $bundleName="windowsRS1-integration"

+                                Write-Host -ForegroundColor Green "Creating ${bundleName}-bundles.zip"

+

+                                # archiveArtifacts does not support env-vars to , so save the artifacts in a fixed location

+                                Compress-Archive -Path "${env:TEMP}/CIDUT.out", "${env:TEMP}/CIDUT.err" -CompressionLevel Optimal -DestinationPath "${bundleName}-bundles.zip"

+                                '''

+

+                                archiveArtifacts artifacts: '*-bundles.zip', allowEmptyArchive: true

+                            }

+                        }

+                        cleanup {

+                            sh 'make clean'

+                            deleteDir()

+                        }

+                    }

                 }

                 stage('win-RS5') {

                     when {

@@ -740,11 +798,12 @@ pipeline {

                     }

                     environment {

                         DOCKER_BUILDKIT        = '0'

+                        DOCKER_DUT_DEBUG       = '1'

                         SKIP_VALIDATION_TESTS  = '1'

                         SOURCES_DRIVE          = 'd'

                         SOURCES_SUBDIR         = 'gopath'

                         TESTRUN_DRIVE          = 'd'

-                        TESTRUN_SUBDIR         = "CI-$BUILD_NUMBER"

+                        TESTRUN_SUBDIR         = "CI"

                         WINDOWS_BASE_IMAGE     = 'mcr.microsoft.com/windows/servercore'

                         WINDOWS_BASE_IMAGE_TAG = 'ltsc2019'

                     }

@@ -772,6 +831,25 @@ pipeline {

                             }

                         }

                     }

+                    post {

+                        always {

+                            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE', message: 'Failed to create bundles.tar.gz') {

+                                powershell '''

+                                $bundleName="windowsRS5-integration"

+                                Write-Host -ForegroundColor Green "Creating ${bundleName}-bundles.zip"

+

+                                # archiveArtifacts does not support env-vars to , so save the artifacts in a fixed location

+                                Compress-Archive -Path "${env:TEMP}/CIDUT.out", "${env:TEMP}/CIDUT.err" -CompressionLevel Optimal -DestinationPath "${bundleName}-bundles.zip"

+                                '''

+

+                                archiveArtifacts artifacts: '*-bundles.zip', allowEmptyArchive: true

+                            }

+                        }

+                        cleanup {

+                            sh 'make clean'

+                            deleteDir()

+                        }

+                    }

                 }

             }

         }

@@ -111,7 +111,7 @@

 			# still stumble into him in our issue tracker, or on IRC.

 			"erikh",

-			# Evan Hazlett is the creator of of the Shipyard and Interlock open source projects,

+			# Evan Hazlett is the creator of the Shipyard and Interlock open source projects,

 			# and the author of "Orca", which became the foundation of Docker Universal Control

 			# Plane (UCP). As a maintainer, Evan helped integrating SwarmKit (secrets, tasks)

 			# into the Docker engine.

@@ -53,7 +53,6 @@ DOCKER_ENVS := \

 	-e DOCKER_TEST_HOST \

 	-e DOCKER_USERLANDPROXY \

 	-e DOCKERD_ARGS \

-	-e TEST_INTEGRATION_DEST \

 	-e TEST_INTEGRATION_DIR \

 	-e TEST_SKIP_INTEGRATION \

 	-e TEST_SKIP_INTEGRATION_CLI \

@@ -3262,7 +3262,7 @@ definitions:

           <p><br /></p>

-          - "ingress" makes the target port accessible on on every node,

+          - "ingress" makes the target port accessible on every node,

             regardless of whether there is a task for the service running on

             that node or not.

           - "host" bypasses the routing mesh and publish the port directly on

@@ -24,8 +24,11 @@ func init() {

 	reexec.Init()

 }

-func initDispatchTestCases() []dispatchTestCase {

-	dispatchTestCases := []dispatchTestCase{

+func TestDispatch(t *testing.T) {

+	if runtime.GOOS != "windows" {

+		skip.If(t, os.Getuid() != 0, "skipping test that requires root")

+	}

+	testCases := []dispatchTestCase{

 		{

 			name: "ADD multiple files to file",

 			cmd: &instructions.AddCommand{SourcesAndDest: instructions.SourcesAndDest{

@@ -92,56 +95,46 @@ func initDispatchTestCases() []dispatchTestCase {

 			}},

 			expectedError: "source can't be a URL for COPY",

 			files:         nil,

-		}}

-

-	return dispatchTestCases

-}

-

-func TestDispatch(t *testing.T) {

-	if runtime.GOOS != "windows" {

-		skip.If(t, os.Getuid() != 0, "skipping test that requires root")

+		},

 	}

-	testCases := initDispatchTestCases()

-	for _, testCase := range testCases {

-		executeTestCase(t, testCase)

-	}

-}

+	for _, tc := range testCases {

+		t.Run(tc.name, func(t *testing.T) {

+			contextDir, cleanup := createTestTempDir(t, "", "builder-dockerfile-test")

+			defer cleanup()

-func executeTestCase(t *testing.T, testCase dispatchTestCase) {

-	contextDir, cleanup := createTestTempDir(t, "", "builder-dockerfile-test")

-	defer cleanup()

+			for filename, content := range tc.files {

+				createTestTempFile(t, contextDir, filename, content, 0777)

+			}

-	for filename, content := range testCase.files {

-		createTestTempFile(t, contextDir, filename, content, 0777)

-	}

+			tarStream, err := archive.Tar(contextDir, archive.Uncompressed)

-	tarStream, err := archive.Tar(contextDir, archive.Uncompressed)

+			if err != nil {

+				t.Fatalf("Error when creating tar stream: %s", err)

+			}

-	if err != nil {

-		t.Fatalf("Error when creating tar stream: %s", err)

-	}

-

-	defer func() {

-		if err = tarStream.Close(); err != nil {

-			t.Fatalf("Error when closing tar stream: %s", err)

-		}

-	}()

+			defer func() {

+				if err = tarStream.Close(); err != nil {

+					t.Fatalf("Error when closing tar stream: %s", err)

+				}

+			}()

-	context, err := remotecontext.FromArchive(tarStream)

+			context, err := remotecontext.FromArchive(tarStream)

-	if err != nil {

-		t.Fatalf("Error when creating tar context: %s", err)

-	}

+			if err != nil {

+				t.Fatalf("Error when creating tar context: %s", err)

+			}

-	defer func() {

-		if err = context.Close(); err != nil {

-			t.Fatalf("Error when closing tar context: %s", err)

-		}

-	}()

+			defer func() {

+				if err = context.Close(); err != nil {

+					t.Fatalf("Error when closing tar context: %s", err)

+				}

+			}()

-	b := newBuilderWithMockBackend()

-	sb := newDispatchRequest(b, '`', context, NewBuildArgs(make(map[string]*string)), newStagesBuildResults())

-	err = dispatch(sb, testCase.cmd)

-	assert.Check(t, is.ErrorContains(err, testCase.expectedError))

+			b := newBuilderWithMockBackend()

+			sb := newDispatchRequest(b, '`', context, NewBuildArgs(make(map[string]*string)), newStagesBuildResults())

+			err = dispatch(sb, tc.cmd)

+			assert.Check(t, is.ErrorContains(err, tc.expectedError))

+		})

+	}

 }

@@ -3,8 +3,10 @@ package main

 import (

 	"runtime"

+	"github.com/docker/docker/daemon"

 	"github.com/docker/docker/daemon/config"

 	"github.com/docker/docker/opts"

+	"github.com/docker/docker/plugin/executor/containerd"

 	"github.com/docker/docker/registry"

 	"github.com/spf13/pflag"

 )

@@ -85,7 +87,13 @@ func installCommonConfigFlags(conf *config.Config, flags *pflag.FlagSet) error {

 	conf.MaxConcurrentDownloads = &maxConcurrentDownloads

 	conf.MaxConcurrentUploads = &maxConcurrentUploads

-	return nil

+

+	flags.StringVar(&conf.ContainerdNamespace, "containerd-namespace", daemon.ContainersNamespace, "Containerd namespace to use")

+	if err := flags.MarkHidden("containerd-namespace"); err != nil {

+		return err

+	}

+	flags.StringVar(&conf.ContainerdPluginNamespace, "containerd-plugins-namespace", containerd.PluginNamespace, "Containerd namespace to use for plugins")

+	return flags.MarkHidden("containerd-plugins-namespace")

 }

 func installRegistryServiceFlags(options *registry.ServiceOptions, flags *pflag.FlagSet) {

@@ -235,6 +235,9 @@ type CommonConfig struct {

 	Features map[string]bool `json:"features,omitempty"`

 	Builder BuilderConfig `json:"builder,omitempty"`

+

+	ContainerdNamespace       string `json:"containerd-namespace,omitempty"`

+	ContainerdPluginNamespace string `json:"containerd-plugin-namespace,omitempty"`

 }

 // IsValueSet returns true if a configuration value

@@ -875,7 +875,7 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S

 		grpc.WithDefaultCallOptions(grpc.MaxCallSendMsgSize(defaults.DefaultMaxSendMsgSize)),

 	}

 	if config.ContainerdAddr != "" {

-		d.containerdCli, err = containerd.New(config.ContainerdAddr, containerd.WithDefaultNamespace(ContainersNamespace), containerd.WithDialOpts(gopts), containerd.WithTimeout(60*time.Second))

+		d.containerdCli, err = containerd.New(config.ContainerdAddr, containerd.WithDefaultNamespace(config.ContainerdNamespace), containerd.WithDialOpts(gopts), containerd.WithTimeout(60*time.Second))

 		if err != nil {

 			return nil, errors.Wrapf(err, "failed to dial %q", config.ContainerdAddr)

 		}

@@ -887,13 +887,13 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S

 		// Windows is not currently using containerd, keep the

 		// client as nil

 		if config.ContainerdAddr != "" {

-			pluginCli, err = containerd.New(config.ContainerdAddr, containerd.WithDefaultNamespace(pluginexec.PluginNamespace), containerd.WithDialOpts(gopts), containerd.WithTimeout(60*time.Second))

+			pluginCli, err = containerd.New(config.ContainerdAddr, containerd.WithDefaultNamespace(config.ContainerdPluginNamespace), containerd.WithDialOpts(gopts), containerd.WithTimeout(60*time.Second))

 			if err != nil {

 				return nil, errors.Wrapf(err, "failed to dial %q", config.ContainerdAddr)

 			}

 		}

-		return pluginexec.New(ctx, getPluginExecRoot(config.Root), pluginCli, m)

+		return pluginexec.New(ctx, getPluginExecRoot(config.Root), pluginCli, config.ContainerdPluginNamespace, m)

 	}

 	// Plugin system initialization should happen before restore. Do not change order.

@@ -1041,7 +1041,7 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S

 	go d.execCommandGC()

-	d.containerd, err = libcontainerd.NewClient(ctx, d.containerdCli, filepath.Join(config.ExecRoot, "containerd"), ContainersNamespace, d)

+	d.containerd, err = libcontainerd.NewClient(ctx, d.containerdCli, filepath.Join(config.ExecRoot, "containerd"), config.ContainerdNamespace, d)

 	if err != nil {

 		return nil, err

 	}

@@ -736,6 +736,9 @@ func (daemon *Daemon) initRuntimes(runtimes map[string]types.Runtime) (err error

 // verifyDaemonSettings performs validation of daemon config struct

 func verifyDaemonSettings(conf *config.Config) error {

+	if conf.ContainerdNamespace == conf.ContainerdPluginNamespace {

+		return errors.New("containers namespace and plugins namespace cannot be the same")

+	}

 	// Check for mutually incompatible config options

 	if conf.BridgeConfig.Iface != "" && conf.BridgeConfig.IP != "" {

 		return fmt.Errorf("You specified -b & --bip, mutually exclusive options. Please specify only one")

@@ -285,6 +285,9 @@ func TestLogClosed(t *testing.T) {

 	}

 }

+// TestLogBlocking tests that the Log method blocks appropriately when

+// non-blocking behavior is not enabled.  Blocking is achieved through an

+// internal channel that must be drained for Log to return.

 func TestLogBlocking(t *testing.T) {

 	mockClient := newMockClient()

 	stream := &logStream{

@@ -299,18 +302,20 @@ func TestLogBlocking(t *testing.T) {

 		err := stream.Log(&logger.Message{})

 		errorCh <- err

 	}()

+	// block until the goroutine above has started

 	<-started

 	select {

 	case err := <-errorCh:

 		t.Fatal("Expected stream.Log to block: ", err)

 	default:

-		break

 	}

+	// assuming it is blocked, we can now try to drain the internal channel and

+	// unblock it

 	select {

-	case <-stream.messages:

-		break

-	default:

+	case <-time.After(10 * time.Millisecond):

+		// if we're unable to drain the channel within 10ms, something seems broken

 		t.Fatal("Expected to be able to read from stream.messages but was unable to")

+	case <-stream.messages:

 	}

 	select {

 	case err := <-errorCh:

@@ -925,7 +925,12 @@ func TestFrequency(t *testing.T) {

 	// 1 to verify connection and 10 to verify that we have sent messages with required frequency,

 	// but because frequency is too small (to keep test quick), instead of 11, use 9 if context switches will be slow

-	if hec.numOfRequests < 9 {

+	expectedRequests := 9

+	if runtime.GOOS == "windows" {

+		// sometimes in Windows, this test fails with number of requests showing 8. So be more conservative.

+		expectedRequests = 7

+	}

+	if hec.numOfRequests < expectedRequests {

 		t.Fatalf("Unexpected number of requests %d", hec.numOfRequests)

 	}

@@ -15,6 +15,11 @@ if ($env:BUILD_TAG -match "-LoW") { $env:LCOW_MODE=1 }

 if ($env:BUILD_TAG -match "-WoW") { $env:LCOW_MODE="" }

+Write-Host -ForegroundColor Red "DEBUG: print all environment variables to check how Jenkins runs this script"

+$allArgs = [Environment]::GetCommandLineArgs()

+Write-Host -ForegroundColor Red $allArgs

+Write-Host -ForegroundColor Red "----------------------------------------------------------------------------"

+

 # -------------------------------------------------------------------------------------------

 # When executed, we rely on four variables being set in the environment:

 #

@@ -46,10 +51,24 @@ if ($env:BUILD_TAG -match "-WoW") { $env:LCOW_MODE="" }

 #                        TESTRUN_DRIVE\TESTRUN_SUBDIR\CI-<CommitID> or

 #                        d:\CI\CI-<CommitID>

 #

+# Optional environment variables help in CI:

+#

+#    BUILD_NUMBER + BRANCH_NAME   are optional variables to be added to the directory below TESTRUN_SUBDIR

+#                        to have individual folder per CI build. If some files couldn't be

+#                        cleaned up and we want to re-run the build in CI.

+#                        Hence, the daemon under test is run under

+#                        TESTRUN_DRIVE\TESTRUN_SUBDIR\PR-<PR-Number>\<BuildNumber> or

+#                        d:\CI\PR-<PR-Number>\<BuildNumber>

+#

 # In addition, the following variables can control the run configuration:

 #

 #    DOCKER_DUT_DEBUG         if defined starts the daemon under test in debug mode.

 #

+#   DOCKER_STORAGE_OPTS       comma-separated list of optional storage driver options for the daemon under test

+#                             examples:

+#                             DOCKER_STORAGE_OPTS="size=40G"

+#                             DOCKER_STORAGE_OPTS="lcow.globalmode=false,lcow.kernel=kernel.efi"

+#

 #    SKIP_VALIDATION_TESTS    if defined skips the validation tests

 #

 #    SKIP_UNIT_TESTS          if defined skips the unit tests

@@ -266,7 +285,7 @@ Try {

         }

       }

     } Catch {}

-    if ($defender) { Throw "ERROR: Windows Defender real time protection must be disabled for integration tests" }

+    if ($defender) { Write-Host -ForegroundColor Magenta "WARN: Windows Defender real time protection is enabled, which may cause some integration tests to fail" }

     # Make sure SOURCES_DRIVE is set

     if ($null -eq $env:SOURCES_DRIVE) { Throw "ERROR: Environment variable SOURCES_DRIVE is not set" }

@@ -418,7 +437,12 @@ Try {

     # Redirect to a temporary location. 

     $TEMPORIG=$env:TEMP

-    $env:TEMP="$env:TESTRUN_DRIVE`:\$env:TESTRUN_SUBDIR\CI-$COMMITHASH"

+    if ($null -eq $env:BUILD_NUMBER) {

+      $env:TEMP="$env:TESTRUN_DRIVE`:\$env:TESTRUN_SUBDIR\CI-$COMMITHASH"

+    } else {

+      # individual temporary location per CI build that better matches the BUILD_URL

+      $env:TEMP="$env:TESTRUN_DRIVE`:\$env:TESTRUN_SUBDIR\$env:BRANCH_NAME\$env:BUILD_NUMBER"

+    }

     $env:LOCALAPPDATA="$env:TEMP\localappdata"

     $errorActionPreference='Stop'

     New-Item -ItemType Directory "$env:TEMP" -ErrorAction SilentlyContinue | Out-Null

@@ -580,6 +604,15 @@ Try {

         $dutArgs += "--exec-opt isolation=hyperv"

     }

+    # Arguments: Allow setting optional storage-driver options

+    # example usage: DOCKER_STORAGE_OPTS="lcow.globalmode=false,lcow.kernel=kernel.efi"

+    if (-not ("$env:DOCKER_STORAGE_OPTS" -eq "")) {

+        Write-Host -ForegroundColor Green "INFO: Running the daemon under test with storage-driver options ${env:DOCKER_STORAGE_OPTS}"

+        $env:DOCKER_STORAGE_OPTS.Split(",") | ForEach {

+            $dutArgs += "--storage-opt $_"

+        }

+    }

+

     # Start the daemon under test, ensuring everything is redirected to folders under $TEMP.

     # Important - we launch the -$COMMITHASH version so that we can kill it without

     # killing the control daemon. 

@@ -608,7 +641,8 @@ Try {

     # Start tailing the daemon under test if the command is installed

     if ($null -ne (Get-Command "tail" -ErrorAction SilentlyContinue)) {

-        $tail = start-process "tail" -ArgumentList "-f $env:TEMP\dut.out" -ErrorAction SilentlyContinue

+        Write-Host -ForegroundColor green "INFO: Start tailing logs of the daemon under tests"

+        $tail = Start-Process "tail" -ArgumentList "-f $env:TEMP\dut.out" -PassThru -ErrorAction SilentlyContinue

     }

     # Verify we can get the daemon under test to respond 

@@ -717,7 +751,7 @@ Try {

         # Inspect the pulled or loaded image to get the version directly

         $ErrorActionPreference = "SilentlyContinue"

-        $dutimgVersion = $(&"$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" inspect  $($env:WINDOWS_BASE_IMAGE) --format "{{.OsVersion}}")

+        $dutimgVersion = $(&"$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" inspect "$($env:WINDOWS_BASE_IMAGE):$env:WINDOWS_BASE_IMAGE_TAG" --format "{{.OsVersion}}")

         $ErrorActionPreference = "Stop"

         Write-Host -ForegroundColor Green $("INFO: Version of $($env:WINDOWS_BASE_IMAGE):$env:WINDOWS_BASE_IMAGE_TAG is '"+$dutimgVersion+"'")

     }

@@ -944,6 +978,12 @@ Try {

         Remove-Item "$env:TEMP\docker.pid" -force -ErrorAction SilentlyContinue

     }

+    # Stop the tail process (if started)

+    if ($null -ne $tail) {

+        Write-Host -ForegroundColor green "INFO: Stop tailing logs of the daemon under tests"

+        Stop-Process -InputObject $tail -Force

+    }

+

     Write-Host -ForegroundColor Green "INFO: executeCI.ps1 Completed successfully at $(Get-Date)."

 }

 Catch [Exception] {

@@ -960,6 +1000,9 @@ Catch [Exception] {

     Throw $_

 }

 Finally {

+    # Preserve the LastExitCode of the tests

+    $tmpLastExitCode = $LastExitCode

+

     $ErrorActionPreference="SilentlyContinue"

     $global:ProgressPreference=$origProgressPreference

     Write-Host  -ForegroundColor Green "INFO: Tidying up at end of run"

@@ -991,6 +1034,12 @@ Finally {

     Set-Location "$env:SOURCES_DRIVE\$env:SOURCES_SUBDIR" -ErrorAction SilentlyContinue

     Nuke-Everything

+

+    # Restore the TEMP path

+    if ($null -ne $TEMPORIG) { $env:TEMP="$TEMPORIG" }

+

     $Dur=New-TimeSpan -Start $StartTime -End $(Get-Date)

     Write-Host -ForegroundColor $FinallyColour "`nINFO: executeCI.ps1 exiting at $(date). Duration $dur`n"

+

+    exit $tmpLastExitCode

 }

@@ -134,7 +134,7 @@ Function Check-InContainer() {

 # outside of a container where it may be out of date with master.

 Function Verify-GoVersion() {

     Try {

-        $goVersionDockerfile=(Select-String -Path ".\Dockerfile" -Pattern "^ARG[\s]+GO_VERSION=(.*)$").Matches.groups[1].Value.TrimEnd(".0")

+        $goVersionDockerfile=(Select-String -Path ".\Dockerfile" -Pattern "^ARG[\s]+GO_VERSION=(.*)$").Matches.groups[1].Value -replace '\.0$',''

         $goVersionInstalled=(go version).ToString().Split(" ")[2].SubString(2)

     }

     Catch [Exception] {

@@ -28,30 +28,6 @@ export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

 export MAKEDIR="$SCRIPTDIR/make"

 export PKG_CONFIG=${PKG_CONFIG:-pkg-config}

-# We're a nice, sexy, little shell script, and people might try to run us;

-# but really, they shouldn't. We want to be in a container!

-inContainer="AssumeSoInitially"

-if [ "$(go env GOHOSTOS)" = 'windows' ]; then

-	if [ -z "$FROM_DOCKERFILE" ]; then

-		unset inContainer

-	fi

-else

-	if [ "$PWD" != "/go/src/$DOCKER_PKG" ]; then

-		unset inContainer

-	fi

-fi

-

-if [ -z "$inContainer" ]; then

-	{

-		echo "# WARNING! I don't seem to be running in a Docker container."

-		echo "# The result of this command might be an incorrect build, and will not be"

-		echo "# officially supported."

-		echo "#"

-		echo "# Try this instead: make all"

-		echo "#"

-	} >&2

-fi

-

 echo

 # List of bundles to create when no argument is passed

@@ -72,9 +72,27 @@ run_test_integration_suites() {

 	for dir in ${integration_api_dirs}; do

 		if ! (

 			cd "$dir"

-			echo "Running $PWD flags=${flags}"

+			# Create a useful package name based on the tests's $dir. We need to take

+			# into account that  "$dir" can be either an absolute (/go/src/github.com/docker/docker/integration/foo)

+			# or relative (./integration/foo) path. To account for both, first we strip

+			# the absolute path, then remove any leading periods and slashes.

+			pkgname="${dir}"

+			pkgname="${pkgname#*${GOPATH}/src/${DOCKER_PKG}}"

+			pkgname="${pkgname#*.}"

+			pkgname="${pkgname#*\/}"

+

+			# Finally, we use periods as separator (instead of slashes) to be more

+			# in line with Java package names (which is what junit.xml was designed for)

+			pkgname="$(go env GOARCH).${pkgname//\//.}"

+			echo "Running $PWD (${pkgname}) flags=${flags}"

+			[ -n "$TESTDEBUG" ] && set -x

 			# shellcheck disable=SC2086

-			test_env ./test.main ${flags}

+			test_env gotestsum \

+				--format=standard-verbose \

+				--jsonfile="${ABS_DEST}/${pkgname//./-}-go-test-report.json" \

+				--junitfile="${ABS_DEST}/${pkgname//./-}-junit-report.xml" \

+				--raw-command \

+				-- go tool test2json -p "${pkgname}" -t ./test.main ${flags}

 		); then exit 1; fi

 	done

 }

@@ -15,16 +15,16 @@ copy_binaries() {

 	fi

 	echo "Copying nested executables into $dir"

 	for file in containerd containerd-shim ctr runc docker-init docker-proxy rootlesskit rootlesskit-docker-proxy dockerd-rootless.sh; do

-		cp -f `which "$file"` "$dir/"

-		if [ "$hash" == "hash" ]; then

+		cp -f "$(command -v "$file")" "$dir/"

+		if [ "$hash" = "hash" ]; then

 			hash_files "$dir/$file"

 		fi

 	done

 	# vpnkit is amd64 only

-	if which "vpnkit.$(uname -m)" 2>&1 >/dev/null; then

-		cp -f `which "vpnkit.$(uname -m)"` "$dir/vpnkit"

-		if [ "$hash" == "hash" ]; then

+	if command -v "vpnkit.$(uname -m)" 2>&1 >/dev/null; then

+		cp -f "$(command -v "vpnkit.$(uname -m)")" "$dir/vpnkit"

+		if [ "$hash" = "hash" ]; then

 			hash_files "$dir/vpnkit"

 		fi

 	fi

@@ -13,6 +13,7 @@ source hack/make/.integration-test-helpers

 # TODO remove these skip once we update to a docker-py version that has https://github.com/docker/docker-py/pull/2369, https://github.com/docker/docker-py/pull/2380, https://github.com/docker/docker-py/pull/2382

 : "${PY_TEST_OPTIONS:=\

 --deselect=tests/integration/api_swarm_test.py::SwarmTest::test_init_swarm_data_path_addr \

+--deselect=tests/integration/api_container_test.py::AttachContainerTest::test_attach_no_stream \

 --deselect=tests/integration/api_exec_test.py::ExecTest::test_detach_with_arg \

 --deselect=tests/integration/api_exec_test.py::ExecDemuxTest::test_exec_command_tty_stream_no_demux \

 --deselect=tests/integration/api_build_test.py::BuildTest::test_build_invalid_platform \

@@ -1,12 +1,6 @@

 #!/usr/bin/env bash

 set -e -o pipefail

-if [ -n "$TEST_INTEGRATION_DEST" ]; then

-	export DEST="$ABS_DEST/$TEST_INTEGRATION_DEST"

-	export DOCKER_INTEGRATION_DAEMON_DEST="$DEST"

-	mkdir -p "$DEST"

-fi

-

 source hack/make/.integration-test-helpers

 if [ ! -z "${TEST_SKIP_INTEGRATION}" ] && [ ! -z "${TEST_SKIP_INTEGRATION_CLI}" ]; then

@@ -4,10 +4,11 @@ set -e -o pipefail

 SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

 # CI platforms differ, so per-platform GOMETALINTER_OPTS can be set

-# from a platform-specific Dockerfile, otherwise let's just set

+# in the Jenkinsfile, otherwise let's just set a

 # (somewhat pessimistic) default of 10 minutes.

-: ${GOMETALINTER_OPTS=--deadline=10m}

+: "${GOMETALINTER_OPTS=--deadline=10m}"

+# shellcheck disable=SC2086

 gometalinter \

 	${GOMETALINTER_OPTS} \

-	--config ${SCRIPTDIR}/gometalinter.json ./...

+	--config "${SCRIPTDIR}/gometalinter.json" ./...

@@ -28,7 +28,7 @@ func (s *DockerSuite) BenchmarkConcurrentContainerActions(c *check.C) {

 			go func() {

 				defer innerGroup.Done()

 				for i := 0; i < numIterations; i++ {

-					args := []string{"run", "-d", defaultSleepImage}

+					args := []string{"run", "-d", "busybox"}

 					args = append(args, sleepCommandForDaemonPlatform()...)

 					out, _, err := dockerCmdWithError(args...)

 					if err != nil {

@@ -304,8 +304,8 @@ func init() {

 type DockerSwarmSuite struct {

 	server      *httptest.Server

 	ds          *DockerSuite

+	daemonsLock sync.Mutex // protect access to daemons and portIndex

 	daemons     []*daemon.Daemon

-	daemonsLock sync.Mutex // protect access to daemons

 	portIndex   int

 }

@@ -333,11 +333,11 @@ func (s *DockerSwarmSuite) AddDaemon(c *check.C, joinSwarm, manager bool) *daemo

 			d.StartAndSwarmInit(c)

 		}

 	} else {

-		d.StartNode(c)

+		d.StartNodeWithBusybox(c)

 	}

-	s.portIndex++

 	s.daemonsLock.Lock()

+	s.portIndex++

 	s.daemons = append(s.daemons, d)

 	s.daemonsLock.Unlock()

@@ -354,9 +354,8 @@ func (s *DockerSwarmSuite) TearDownTest(c *check.C) {

 		}

 	}