@@ -1,9 +1,19 @@

+# WARNING WARNING WARNING - DO NOT EDIT THIS FILE IN JENKINS DIRECTLY.

+# SUBMIT A PR TO https://github.com/jhowardmsft/docker-w2wCIScripts/blob/master/runCI/executeCI.ps1,

+# AND MAKE SURE https://github.com/jhowardmsft/docker-w2wCIScripts/blob/master/runCI/Invoke-DockerCI.ps1

+# ISN'T BROKEN!!!!!!! VALIDATE USING A TEST CONTEXT IN JENKINS. THEN COPY/PASTE INTO JENKINS PRODUCTION.

+#

 # Jenkins CI scripts for Windows to Windows CI (Powershell Version)

 # By John Howard (@jhowardmsft) January 2016 - bash version; July 2016 Ported to PowerShell

 $ErrorActionPreference = 'Stop'

 $StartTime=Get-Date

-#$env:DOCKER_DUT_DEBUG="yes" # Comment out to not be in debug mode

+

+# Put up top to be blindingly obvious. The production jenkins.dockerproject.org Linux-container 

+# CI job is "Docker-PRs-LoW-RS3". Force into LCOW mode for this run, or not.

+if ($env:BUILD_TAG -match "-LoW") { $env:LCOW_MODE=1 }

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

+

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

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

@@ -17,7 +27,7 @@ $StartTime=Get-Date

 #

 #    SOURCES_SUBDIR      is the top level directory under SOURCES_DRIVE where the

 #                        sources are cloned to. There are no platform semantics in this

-#                        as it does not include slashes.

+#                        as it does not include slashes. 

 #                        For example 'gopath'

 #

 #                        Based on the above examples, it would be expected that Jenkins

@@ -60,13 +70,19 @@ $StartTime=Get-Date

 #    SKIP_IMAGE_BUILD         if defined doesn't build the 'docker' image

 #

 #    INTEGRATION_IN_CONTAINER if defined, runs the integration tests from inside a container.

-#                             As of July 2016, there are known issues with this.

+#                             As of July 2016, there are known issues with this. 

 #

 #    SKIP_ALL_CLEANUP         if defined, skips any cleanup at the start or end of the run

 #

 #    WINDOWS_BASE_IMAGE       if defined, uses that as the base image. Note that the

 #                             docker integration tests are also coded to use the same

 #                             environment variable, and if no set, defaults to microsoft/windowsservercore

+#

+#    LCOW_BASIC_MODE          if defined, does very basic LCOW verification. Ultimately we 

+#                             want to run the entire CI suite from docker, but that's a way off.

+#                            

+#    LCOW_MODE                if defined, runs the entire CI suite

+#                            

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

 #

 # Jenkins Integration. Add a Windows Powershell build step as follows:

@@ -80,7 +96,7 @@ $StartTime=Get-Date

 #    try {

 #        Write-Host -ForegroundColor green "INFO: Downloading latest execution script..."

 #        $wc.Downloadfile($CISCRIPT_DEFAULT_LOCATION, $CISCRIPT_LOCAL_LOCATION)

-#    }

+#    } 

 #    catch [System.Net.WebException]

 #    {

 #        Throw ("Failed to download: $_")

@@ -88,9 +104,11 @@ $StartTime=Get-Date

 #    & $CISCRIPT_LOCAL_LOCATION

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

-$SCRIPT_VER="10-May-2017 12:16 PDT"

+

+$SCRIPT_VER="28-Aug-2018 09:33 PDT" 

 $FinallyColour="Cyan"

+#$env:DOCKER_DUT_DEBUG="yes" # Comment out to not be in debug mode

 #$env:SKIP_UNIT_TESTS="yes"

 #$env:SKIP_VALIDATION_TESTS="yes"

 #$env:SKIP_ZAP_DUT=""

@@ -104,34 +122,35 @@ $FinallyColour="Cyan"

 Function Nuke-Everything {

     $ErrorActionPreference = 'SilentlyContinue'

-    if ($env:SKIP_ALL_CLEANUP -ne $null) {

-        Write-Host -ForegroundColor Magenta "WARN: Skipping all cleanup"

-        return

-    }

     try {

-        Write-Host -ForegroundColor green "INFO: Nuke-Everything..."

-        $containerCount = ($(docker ps -aq | Measure-Object -line).Lines)

-        if (-not $LastExitCode -eq 0) {

-            Throw "ERROR: Failed to get container count from control daemon while nuking"

-        }

-        Write-Host -ForegroundColor green "INFO: Container count on control daemon to delete is $containerCount"

-        if ($(docker ps -aq | Measure-Object -line).Lines -gt 0) {

-            docker rm -f $(docker ps -aq)

-        }

-        $imageCount=($(docker images --format "{{.Repository}}:{{.ID}}" | `

-                        select-string -NotMatch "windowsservercore" | `

-                        select-string -NotMatch "nanoserver" | `

-                        select-string -NotMatch "docker" | `

-                        Measure-Object -line).Lines)

-        if ($imageCount -gt 0) {

-            Write-Host -Foregroundcolor green "INFO: Non-base image count on control daemon to delete is $imageCount"

-            docker rmi -f `

-                $(docker images --format "{{.Repository}}:{{.ID}}" | `

-                        select-string -NotMatch "windowsservercore" | `

-                        select-string -NotMatch "nanoserver" | `

-                        select-string -NotMatch "docker").ToString().Split(":")[1]

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

+            Write-Host -ForegroundColor green "INFO: Nuke-Everything..."

+            $containerCount = ($(docker ps -aq | Measure-Object -line).Lines) 

+            if (-not $LastExitCode -eq 0) {

+                Throw "ERROR: Failed to get container count from control daemon while nuking"

+            }

+

+            Write-Host -ForegroundColor green "INFO: Container count on control daemon to delete is $containerCount"

+            if ($(docker ps -aq | Measure-Object -line).Lines -gt 0) {

+                docker rm -f $(docker ps -aq)

+            }

+            $imageCount=($(docker images --format "{{.Repository}}:{{.ID}}" | `

+                            select-string -NotMatch "windowsservercore" | `

+                            select-string -NotMatch "nanoserver" | `

+                            select-string -NotMatch "docker" | `

+                            Measure-Object -line).Lines)

+            if ($imageCount -gt 0) {

+                Write-Host -Foregroundcolor green "INFO: Non-base image count on control daemon to delete is $imageCount"

+                docker rmi -f `

+                    $(docker images --format "{{.Repository}}:{{.ID}}" | `

+                            select-string -NotMatch "windowsservercore" | `

+                            select-string -NotMatch "nanoserver" | `

+                            select-string -NotMatch "docker").ToString().Split(":")[1]

+            }

+        } else {

+            Write-Host -ForegroundColor Magenta "WARN: Skipping cleanup of images and containers"

         }

         # Kill any spurious daemons. The '-' is IMPORTANT otherwise will kill the control daemon!

@@ -141,6 +160,18 @@ Function Nuke-Everything {

             Stop-Process -Id $p -Force -ErrorAction SilentlyContinue

         }

+        if ($pidFile -ne $Null) {

+            Write-Host "INFO: Tidying pidfile $pidfile"

+             if (Test-Path $pidFile) {

+                $p=Get-Content $pidFile -raw

+                if ($p -ne $null){

+                    Write-Host -ForegroundColor green "INFO: Stopping possible daemon pid $p"

+                    taskkill -f -t -pid $p

+                }

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

+            }

+        }

+

         Stop-Process -name "cc1" -Force -ErrorAction SilentlyContinue 2>&1 | Out-Null

         Stop-Process -name "link" -Force -ErrorAction SilentlyContinue 2>&1 | Out-Null

         Stop-Process -name "compile" -Force -ErrorAction SilentlyContinue 2>&1 | Out-Null

@@ -159,7 +190,7 @@ Function Nuke-Everything {

         # Delete the directory using our dangerous utility unless told not to

         if (Test-Path "$env:TESTRUN_DRIVE`:\$env:TESTRUN_SUBDIR") {

-            if ($env:SKIP_ZAP_DUT -eq $null) {

+            if (($env:SKIP_ZAP_DUT -ne $null) -or ($env:SKIP_ALL_CLEANUP -eq $null)) {

                 Write-Host -ForegroundColor Green "INFO: Nuking $env:TESTRUN_DRIVE`:\$env:TESTRUN_SUBDIR"

                 docker-ci-zap "-folder=$env:TESTRUN_DRIVE`:\$env:TESTRUN_SUBDIR"

             } else {

@@ -167,7 +198,7 @@ Function Nuke-Everything {

             }

         }

-        # RS1 Production Server workaround - Psched

+        # TODO: This should be able to be removed in August 2017 update. Only needed for RS1  Production Server workaround - Psched

         $reg = "HKLM:\System\CurrentControlSet\Services\Psched\Parameters\NdisAdapters"

         $count=(Get-ChildItem $reg | Measure-Object).Count

         if ($count -gt 0) {

@@ -180,7 +211,7 @@ Function Nuke-Everything {

             }

         }

-        # RS1 Production Server workaround - WFPLWFS

+        # TODO: This should be able to be removed in August 2017 update. Only needed for RS1

         $reg = "HKLM:\System\CurrentControlSet\Services\WFPLWFS\Parameters\NdisAdapters"

         $count=(Get-ChildItem $reg | Measure-Object).Count

         if ($count -gt 0) {

@@ -207,8 +238,8 @@ Try {

     $origGOPATH="$env:GOPATH"        # So we can restore it at the end

     # Turn off progress bars

-    $origProgressPreference=$global:ProgressPreference

-    $global:ProgressPreference='SilentlyContinue'

+	$origProgressPreference=$global:ProgressPreference

+	$global:ProgressPreference='SilentlyContinue'

     # Git version

     Write-Host  -ForegroundColor Green "INFO: Running $(git version)"

@@ -248,7 +279,6 @@ Try {

     # SOURCES_DRIVE\SOURCES_SUBDIR must be a directory and exist

     if (-not (Test-Path -PathType Container "$env:SOURCES_DRIVE`:\$env:SOURCES_SUBDIR")) { Throw "ERROR: $env:SOURCES_DRIVE`:\$env:SOURCES_SUBDIR must be an existing directory" }

-

     # Create the TESTRUN_DRIVE\TESTRUN_SUBDIR if it does not already exist

     New-Item -ItemType Directory -Force -Path "$env:TESTRUN_DRIVE`:\$env:TESTRUN_SUBDIR" -ErrorAction SilentlyContinue | Out-Null

@@ -266,12 +296,12 @@ Try {

     # Make sure we are in repo

     if (-not (Test-Path -PathType Leaf -Path ".\Dockerfile.windows")) {

-        Throw "$(pwd) does not container Dockerfile.Windows!"

+        Throw "$(pwd) does not contain Dockerfile.windows!"

     }

     Write-Host  -ForegroundColor Green "INFO: docker/docker repository was found"

     # Make sure microsoft/windowsservercore:latest image is installed in the control daemon. On public CI machines, windowsservercore.tar and nanoserver.tar

-    # are pre-baked and tagged appropriately in the c:\baseimages directory, and can be directly loaded.

+    # are pre-baked and tagged appropriately in the c:\baseimages directory, and can be directly loaded. 

     # Note - this script will only work on 10B (Oct 2016) or later machines! Not 9D or previous due to image tagging assumptions.

     #

     # On machines not on Microsoft corpnet, or those which have not been pre-baked, we have to docker pull the image in which case it will

@@ -288,28 +318,28 @@ Try {

         # Try the internal azure CI image version or Microsoft internal corpnet where the base image is already pre-prepared on the disk,

         # either through Invoke-DockerCI or, in the case of Azure CI servers, baked into the VHD at the same location.

         if (Test-Path $("$env:SOURCES_DRIVE`:\baseimages\"+$ControlDaemonBaseImage+".tar")) {

-

-            # An optimization for CI servers to copy it to the D: drive which is an SSD.

-            if ($env:SOURCES_DRIVE -ne $env:TESTRUN_DRIVE) {

-                $readBaseFrom=$env:TESTRUN_DRIVE

-                if (!(Test-Path "$env:TESTRUN_DRIVE`:\baseimages")) {

-                    New-Item "$env:TESTRUN_DRIVE`:\baseimages" -type directory | Out-Null

-                }

-                if (!(Test-Path "$env:TESTRUN_DRIVE`:\baseimages\windowsservercore.tar")) {

-                    if (Test-Path "$env:SOURCES_DRIVE`:\baseimages\windowsservercore.tar") {

-                        Write-Host -ForegroundColor Green "INFO: Optimisation - copying $env:SOURCES_DRIVE`:\baseimages\windowsservercore.tar to $env:TESTRUN_DRIVE`:\baseimages"

-                        Copy-Item "$env:SOURCES_DRIVE`:\baseimages\windowsservercore.tar" "$env:TESTRUN_DRIVE`:\baseimages"

-                    }

-                }

-                if (!(Test-Path "$env:TESTRUN_DRIVE`:\baseimages\nanoserver.tar")) {

-                    if (Test-Path "$env:SOURCES_DRIVE`:\baseimages\nanoserver.tar") {

-                        Write-Host -ForegroundColor Green "INFO: Optimisation - copying $env:SOURCES_DRIVE`:\baseimages\nanoserver.tar to $env:TESTRUN_DRIVE`:\baseimages"

-                        Copy-Item "$env:SOURCES_DRIVE`:\baseimages\nanoserver.tar" "$env:TESTRUN_DRIVE`:\baseimages"

-                    }

-                }

-                $readBaseFrom=$env:TESTRUN_DRIVE

-            }

-

+		

+			# An optimization for CI servers to copy it to the D: drive which is an SSD.

+			if ($env:SOURCES_DRIVE -ne $env:TESTRUN_DRIVE) {

+				$readBaseFrom=$env:TESTRUN_DRIVE

+				if (!(Test-Path "$env:TESTRUN_DRIVE`:\baseimages")) {

+					New-Item "$env:TESTRUN_DRIVE`:\baseimages" -type directory | Out-Null

+				}

+				if (!(Test-Path "$env:TESTRUN_DRIVE`:\baseimages\windowsservercore.tar")) {

+					if (Test-Path "$env:SOURCES_DRIVE`:\baseimages\windowsservercore.tar") {

+						Write-Host -ForegroundColor Green "INFO: Optimisation - copying $env:SOURCES_DRIVE`:\baseimages\windowsservercore.tar to $env:TESTRUN_DRIVE`:\baseimages"

+						Copy-Item "$env:SOURCES_DRIVE`:\baseimages\windowsservercore.tar" "$env:TESTRUN_DRIVE`:\baseimages"

+					}

+				}

+				if (!(Test-Path "$env:TESTRUN_DRIVE`:\baseimages\nanoserver.tar")) {

+					if (Test-Path "$env:SOURCES_DRIVE`:\baseimages\nanoserver.tar") {

+						Write-Host -ForegroundColor Green "INFO: Optimisation - copying $env:SOURCES_DRIVE`:\baseimages\nanoserver.tar to $env:TESTRUN_DRIVE`:\baseimages"

+						Copy-Item "$env:SOURCES_DRIVE`:\baseimages\nanoserver.tar" "$env:TESTRUN_DRIVE`:\baseimages"

+					}

+				}

+				$readBaseFrom=$env:TESTRUN_DRIVE

+			}

+		

             Write-Host  -ForegroundColor Green "INFO: Loading"$ControlDaemonBaseImage".tar from disk. This may take some time..."

             $ErrorActionPreference = "SilentlyContinue"

             docker load -i $("$readBaseFrom`:\baseimages\"+$ControlDaemonBaseImage+".tar")

@@ -346,14 +376,14 @@ Try {

     docker version

     $ErrorActionPreference = "Stop"

     if (-not($LastExitCode -eq 0)) {

-        Write-Host

+        Write-Host 

         Write-Host  -ForegroundColor Green "---------------------------------------------------------------------------"

         Write-Host  -ForegroundColor Green " Failed to get a response from the control daemon. It may be down."

-        Write-Host  -ForegroundColor Green " Try re-running this CI job, or ask on #docker-dev or #docker-maintainers"

-        Write-Host  -ForegroundColor Green " to see if the the daemon is running. Also check the nssm configuration."

+        Write-Host  -ForegroundColor Green " Try re-running this CI job, or ask on #docker-maintainers on docker slack"

+        Write-Host  -ForegroundColor Green " to see if the the daemon is running. Also check the service configuration."

         Write-Host  -ForegroundColor Green " DOCKER_HOST is set to $DOCKER_HOST."

         Write-Host  -ForegroundColor Green "---------------------------------------------------------------------------"

-        Write-Host

+        Write-Host 

         Throw "ERROR: The control daemon does not appear to be running."

     }

     Write-Host

@@ -382,7 +412,7 @@ Try {

     Nuke-Everything

     cd "$env:SOURCES_DRIVE`:\$env:SOURCES_SUBDIR\src\github.com\docker\docker"

-    # Redirect to a temporary location.

+    # Redirect to a temporary location. 

     $TEMPORIG=$env:TEMP

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

     $env:LOCALAPPDATA="$TEMP\localappdata"

@@ -401,8 +431,23 @@ Try {

     Write-Host -ForegroundColor Green "INFO: Location for testing is $env:TEMP"

     # CI Integrity check - ensure Dockerfile.windows and Dockerfile go versions match

-    $goVersionDockerfileWindows=$(Get-Content ".\Dockerfile.windows" | Select-String "ENV GO_VERSION").ToString().Replace("ENV GO_VERSION=","").Replace("\","").Replace("``","").Trim()

-    $goVersionDockerfile=$(Get-Content ".\Dockerfile" | Select-String "ENV GO_VERSION").ToString().Split(" ")[2]

+    $goVersionDockerfileWindows=$(Get-Content ".\Dockerfile.windows" | Select-String "^ENV GO_VERSION").ToString().Replace("ENV GO_VERSION=","").Replace("\","").Replace("``","").Trim()

+    $goVersionDockerfile=$(Get-Content ".\Dockerfile" | Select-String "^ENV GO_VERSION")

+    

+    # As of go 1.11, Dockerfile changed to be in the format like "FROM golang:1.11.0 AS base".

+    # If a version number ends with .0 (as in 1.11.0, a convention used in golang docker

+    # image versions), it needs to be removed (i.e. "1.11.0" becomes "1.11").

+    if ($goVersionDockerfile -eq $Null) {

+        $goVersionDockerfile=$(Get-Content ".\Dockerfile" | Select-String "^FROM golang:")

+        if ($goVersionDockerfile -ne $Null) {

+            $goVersionDockerfile = $goVersionDockerfile.ToString().Split(" ")[1].Split(":")[1] -replace '\.0$',''

+        }

+    } else {

+        $goVersionDockerfile = $goVersionDockerfile.ToString().Split(" ")[2]

+    }

+    if ($goVersionDockerfile -eq $Null) {

+        Throw "ERROR: Failed to extract golang version from Dockerfile"

+    }

     Write-Host  -ForegroundColor Green "INFO: Validating GOLang consistency in Dockerfile.windows..."

     if (-not ($goVersionDockerfile -eq $goVersionDockerfileWindows)) {

         Throw "ERROR: Mismatched GO versions between Dockerfile and Dockerfile.windows. Update your PR to ensure that both files are updated and in sync. $goVersionDockerfile $goVersionDockerfileWindows"

@@ -423,7 +468,7 @@ Try {

         Write-Host -ForegroundColor Magenta "WARN: Skipping building the docker image"

     }

-    # DON'T THINK THIS IS USED ANYMORE.... $v=$(Get-Content ".\VERSION" -raw).ToString().Replace("`n","").Trim()

+    # Following at the moment must be docker\docker as it's dictated by dockerfile.Windows

     $contPath="$COMMITHASH`:c`:\go\src\github.com\docker\docker\bundles"

     # After https://github.com/docker/docker/pull/30290, .git was added to .dockerignore. Therefore

@@ -446,7 +491,7 @@ Try {

             git status --porcelain --untracked-files=no | Write-Warning

              Write-Host ""

         }

-        $Duration=$(Measure-Command {docker run --name $COMMITHASH -e DOCKER_GITCOMMIT=$COMMITHASH$CommitUnsupported docker hack\make.ps1 -Binary | Out-Host })

+        $Duration=$(Measure-Command {docker run --name $COMMITHASH -e DOCKER_GITCOMMIT=$COMMITHASH$CommitUnsupported docker hack\make.ps1 -Daemon -Client | Out-Host })

         $ErrorActionPreference = "Stop"

         if (-not($LastExitCode -eq 0)) {

             Throw "ERROR: Failed to build binary"

@@ -498,7 +543,7 @@ Try {

         # Extract the golang installer

         Write-Host -ForegroundColor Green "INFO: Extracting go.zip to $env:TEMP\go"

         $Duration=$(Measure-Command { Expand-Archive $env:TEMP\installer\go.zip $env:TEMP -Force | Out-Null})

-        Write-Host  -ForegroundColor Green "INFO: Extraction ended at $(Get-Date). Duration`:$Duration"

+        Write-Host  -ForegroundColor Green "INFO: Extraction ended at $(Get-Date). Duration`:$Duration"    

     } else {

         Write-Host -ForegroundColor Magenta "WARN: Skipping copying and extracting golang from the image"

     }

@@ -514,7 +559,7 @@ Try {

     # Set the GOROOT to be our copy of go from the image

     $env:GOROOT="$env:TEMP\go"

     Write-Host -ForegroundColor Green "INFO: $(go version)"

-

+    

     # Work out the the -H parameter for the daemon under test (DASHH_DUT) and client under test (DASHH_CUT)

     #$DASHH_DUT="npipe:////./pipe/$COMMITHASH" # Can't do remote named pipe

     #$ip = (resolve-dnsname $env:COMPUTERNAME -type A -NoHostsFile -LlmnrNetbiosOnly).IPAddress # Useful to tie down

@@ -524,9 +569,12 @@ Try {

     # Arguments for the daemon under test

     $dutArgs=@()

     $dutArgs += "-H $DASHH_DUT"

-    $dutArgs += "--graph $env:TEMP\daemon"

+    $dutArgs += "--data-root $env:TEMP\daemon"

     $dutArgs += "--pidfile $env:TEMP\docker.pid"

+    # Save the PID file so we can nuke it if set

+    $pidFile="$env:TEMP\docker.pid"

+

     # Arguments: Are we starting the daemon under test in debug mode?

     if (-not ("$env:DOCKER_DUT_DEBUG" -eq "")) {

         Write-Host -ForegroundColor Green "INFO: Running the daemon under test in debug mode"

@@ -541,25 +589,36 @@ Try {

     # 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.

+    # killing the control daemon. 

     Write-Host -ForegroundColor Green "INFO: Starting a daemon under test..."

     Write-Host -ForegroundColor Green "INFO: Args: $dutArgs"

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

+    # In LCOW mode, for now we need to set an environment variable before starting the daemon under test

+    if (($env:LCOW_MODE -ne $Null) -or ($env:LCOW_BASIC_MODE -ne $Null)) {

+        $env:LCOW_SUPPORTED=1

+    }

+

     # Cannot fathom why, but always writes to stderr....

     Start-Process "$env:TEMP\binary\dockerd-$COMMITHASH" `

                   -ArgumentList $dutArgs `

                   -RedirectStandardOutput "$env:TEMP\dut.out" `

-                  -RedirectStandardError "$env:TEMP\dut.err"

+                  -RedirectStandardError "$env:TEMP\dut.err" 

     Write-Host -ForegroundColor Green "INFO: Process started successfully."

     $daemonStarted=1

+    # In LCOW mode, turn off that variable

+    if (($env:LCOW_MODE -ne $Null) -or ($env:LCOW_BASIC_MODE -ne $Null)) {

+        $env:LCOW_SUPPORTED=""

+    }

+

+

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

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

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

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

     }

-    # Verify we can get the daemon under test to respond

+    # Verify we can get the daemon under test to respond 

     $tries=20

     Write-Host -ForegroundColor Green "INFO: Waiting for the daemon under test to start..."

     while ($true) {

@@ -582,7 +641,7 @@ Try {

     # Provide the docker version of the daemon under test for debugging purposes.

     Write-Host -ForegroundColor Green "INFO: Docker version of the daemon under test"

-    Write-Host

+    Write-Host 

     $ErrorActionPreference = "SilentlyContinue"

     & "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" version

     $ErrorActionPreference = "Stop"

@@ -594,7 +653,7 @@ Try {

     # Same as above but docker info

     Write-Host -ForegroundColor Green "INFO: Docker info of the daemon under test"

-    Write-Host

+    Write-Host 

     $ErrorActionPreference = "SilentlyContinue"

     & "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" info

     $ErrorActionPreference = "Stop"

@@ -606,7 +665,7 @@ Try {

     # Same as above but docker images

     Write-Host -ForegroundColor Green "INFO: Docker images of the daemon under test"

-    Write-Host

+    Write-Host 

     $ErrorActionPreference = "SilentlyContinue"

     & "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" images

     $ErrorActionPreference = "Stop"

@@ -616,54 +675,59 @@ Try {

     }

     Write-Host

-    # Default to windowsservercore for the base image used for the tests. The "docker" image

-    # and the control daemon use microsoft/windowsservercore regardless. This is *JUST* for the tests.

-    if ($env:WINDOWS_BASE_IMAGE -eq $Null) {

-        $env:WINDOWS_BASE_IMAGE="microsoft/windowsservercore"

-    }

+    # Don't need Windows images when in LCOW mode.

+    if (($env:LCOW_MODE -eq $Null) -and ($env:LCOW_BASIC_MODE -eq $Null)) {

-    # Lowercase and make sure it has a microsoft/ prefix

-    $env:WINDOWS_BASE_IMAGE = $env:WINDOWS_BASE_IMAGE.ToLower()

-    if ($($env:WINDOWS_BASE_IMAGE -Split "/")[0] -ne "microsoft") {

-        Throw "ERROR: WINDOWS_BASE_IMAGE should start microsoft/"

-    }

+        # Default to windowsservercore for the base image used for the tests. The "docker" image

+        # and the control daemon use microsoft/windowsservercore regardless. This is *JUST* for the tests.

+        if ($env:WINDOWS_BASE_IMAGE -eq $Null) {

+            $env:WINDOWS_BASE_IMAGE="microsoft/windowsservercore"

+        }

-    Write-Host -ForegroundColor Green "INFO: Base image for tests is $env:WINDOWS_BASE_IMAGE"

+        # Lowercase and make sure it has a microsoft/ prefix

+        $env:WINDOWS_BASE_IMAGE = $env:WINDOWS_BASE_IMAGE.ToLower()

+        if ($($env:WINDOWS_BASE_IMAGE -Split "/")[0] -ne "microsoft") {

+            Throw "ERROR: WINDOWS_BASE_IMAGE should start microsoft/"

+        }

-    $ErrorActionPreference = "SilentlyContinue"

-    if ($((& "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" images --format "{{.Repository}}:{{.Tag}}" | Select-String $($env:WINDOWS_BASE_IMAGE+":latest") | Measure-Object -Line).Lines) -eq 0) {

-        # Try the internal azure CI image version or Microsoft internal corpnet where the base image is already pre-prepared on the disk,

-        # either through Invoke-DockerCI or, in the case of Azure CI servers, baked into the VHD at the same location.

-        if (Test-Path $("c:\baseimages\"+$($env:WINDOWS_BASE_IMAGE -Split "/")[1]+".tar")) {

-            Write-Host  -ForegroundColor Green "INFO: Loading"$($env:WINDOWS_BASE_IMAGE -Split "/")[1]".tar from disk into the daemon under test. This may take some time..."

-            $ErrorActionPreference = "SilentlyContinue"

-            & "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" load -i $("$readBaseFrom`:\baseimages\"+$($env:WINDOWS_BASE_IMAGE -Split "/")[1]+".tar")

-            $ErrorActionPreference = "Stop"

-            if (-not $LastExitCode -eq 0) {

-                Throw $("ERROR: Failed to load $readBaseFrom`:\baseimages\"+$($env:WINDOWS_BASE_IMAGE -Split "/")[1]+".tar into daemon under test")

+        Write-Host -ForegroundColor Green "INFO: Base image for tests is $env:WINDOWS_BASE_IMAGE"

+

+        $ErrorActionPreference = "SilentlyContinue"

+        if ($((& "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" images --format "{{.Repository}}:{{.Tag}}" | Select-String $($env:WINDOWS_BASE_IMAGE+":latest") | Measure-Object -Line).Lines) -eq 0) {

+            # Try the internal azure CI image version or Microsoft internal corpnet where the base image is already pre-prepared on the disk,

+            # either through Invoke-DockerCI or, in the case of Azure CI servers, baked into the VHD at the same location.

+            if (Test-Path $("c:\baseimages\"+$($env:WINDOWS_BASE_IMAGE -Split "/")[1]+".tar")) {

+                Write-Host  -ForegroundColor Green "INFO: Loading"$($env:WINDOWS_BASE_IMAGE -Split "/")[1]".tar from disk into the daemon under test. This may take some time..."

+                $ErrorActionPreference = "SilentlyContinue"

+                & "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" load -i $("$readBaseFrom`:\baseimages\"+$($env:WINDOWS_BASE_IMAGE -Split "/")[1]+".tar")

+                $ErrorActionPreference = "Stop"

+                if (-not $LastExitCode -eq 0) {

+                    Throw $("ERROR: Failed to load $readBaseFrom`:\baseimages\"+$($env:WINDOWS_BASE_IMAGE -Split "/")[1]+".tar into daemon under test")

+                }

+                Write-Host -ForegroundColor Green "INFO: docker load of"$($env:WINDOWS_BASE_IMAGE -Split "/")[1]" into daemon under test completed successfully"

+            } else {

+                # We need to docker pull it instead. It will come in directly as microsoft/imagename:latest

+                Write-Host -ForegroundColor Green $("INFO: Pulling "+$env:WINDOWS_BASE_IMAGE+":latest from docker hub into daemon under test. This may take some time...")

+                $ErrorActionPreference = "SilentlyContinue"

+                & "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" pull $($env:WINDOWS_BASE_IMAGE)

+                $ErrorActionPreference = "Stop"

+                if (-not $LastExitCode -eq 0) {

+                    Throw $("ERROR: Failed to docker pull "+$env:WINDOWS_BASE_IMAGE+":latest into daemon under test.")

+                }

+                Write-Host -ForegroundColor Green $("INFO: docker pull of "+$env:WINDOWS_BASE_IMAGE+":latest into daemon under test completed successfully")

             }

-            Write-Host -ForegroundColor Green "INFO: docker load of"$($env:WINDOWS_BASE_IMAGE -Split "/")[1]" into daemon under test completed successfully"

         } else {

-            # We need to docker pull it instead. It will come in directly as microsoft/imagename:latest

-            Write-Host -ForegroundColor Green $("INFO: Pulling "+$env:WINDOWS_BASE_IMAGE+":latest from docker hub into daemon under test. This may take some time...")

-            $ErrorActionPreference = "SilentlyContinue"

-            & "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" pull $($env:WINDOWS_BASE_IMAGE)

-            $ErrorActionPreference = "Stop"

-            if (-not $LastExitCode -eq 0) {

-                Throw $("ERROR: Failed to docker pull "+$env:WINDOWS_BASE_IMAGE+":latest into daemon under test.")

-            }

-            Write-Host -ForegroundColor Green $("INFO: docker pull of "+$env:WINDOWS_BASE_IMAGE+":latest into daemon under test completed successfully")

+            Write-Host -ForegroundColor Green "INFO: Image"$($env:WINDOWS_BASE_IMAGE+":latest")"is already loaded in the daemon under test"

         }

-    } else {

-        Write-Host -ForegroundColor Green "INFO: Image"$($env:WINDOWS_BASE_IMAGE+":latest")"is already loaded in the daemon under test"

+    

+    

+        # 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}}")

+        $ErrorActionPreference = "Stop"

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

     }

-    # 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}}")

-    $ErrorActionPreference = "Stop"

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

-

     # Run the validation tests unless SKIP_VALIDATION_TESTS is defined.

     if ($env:SKIP_VALIDATION_TESTS -eq $null) {

         Write-Host -ForegroundColor Cyan "INFO: Running validation tests at $(Get-Date)..."

@@ -678,162 +742,188 @@ Try {

         Write-Host -ForegroundColor Magenta "WARN: Skipping validation tests"

     }

+    # Note the unit tests won't work in LCOW mode as I turned off loading the base images above.

     # Run the unit tests inside a container unless SKIP_UNIT_TESTS is defined

-    if ($env:SKIP_UNIT_TESTS -eq $null) {

-        Write-Host -ForegroundColor Cyan "INFO: Running unit tests at $(Get-Date)..."

-        $ErrorActionPreference = "SilentlyContinue"

-        $Duration=$(Measure-Command {docker run -e DOCKER_GITCOMMIT=$COMMITHASH$CommitUnsupported docker hack\make.ps1 -TestUnit | Out-Host })

-        $ErrorActionPreference = "Stop"

-        if (-not($LastExitCode -eq 0)) {

-            Throw "ERROR: Unit tests failed"

+    if (($env:LCOW_MODE -eq $Null) -and ($env:LCOW_BASIC_MODE -eq $Null)) {

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

+            Write-Host -ForegroundColor Cyan "INFO: Running unit tests at $(Get-Date)..."

+            $ErrorActionPreference = "SilentlyContinue"

+            $Duration=$(Measure-Command {docker run -e DOCKER_GITCOMMIT=$COMMITHASH$CommitUnsupported docker hack\make.ps1 -TestUnit | Out-Host })

+            $ErrorActionPreference = "Stop"

+            if (-not($LastExitCode -eq 0)) {

+                Throw "ERROR: Unit tests failed"

+            }

+            Write-Host  -ForegroundColor Green "INFO: Unit tests ended at $(Get-Date). Duration`:$Duration"

+        } else {

+            Write-Host -ForegroundColor Magenta "WARN: Skipping unit tests"

         }

-        Write-Host  -ForegroundColor Green "INFO: Unit tests ended at $(Get-Date). Duration`:$Duration"

-    } else {

-        Write-Host -ForegroundColor Magenta "WARN: Skipping unit tests"

     }

-    # Add the busybox image. Needed for integration tests

-    if ($env:SKIP_INTEGRATION_TESTS -eq $null) {

-        $ErrorActionPreference = "SilentlyContinue"

-        # Build it regardless while switching between nanoserver and windowsservercore

-        #$bbCount = $(& "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" images | Select-String "busybox" | Measure-Object -line).Lines

-        #$ErrorActionPreference = "Stop"

-        #if (-not($LastExitCode -eq 0)) {

-        #    Throw "ERROR: Could not determine if busybox image is present"

-        #}

-        #if ($bbCount -eq 0) {

-            Write-Host -ForegroundColor Green "INFO: Building busybox"

+    # Add the Windows busybox image. Needed for WCOW integration tests

+    if (($env:LCOW_MODE -eq $Null) -and ($env:LCOW_BASIC_MODE -eq $Null)) {

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

             $ErrorActionPreference = "SilentlyContinue"

+            # Build it regardless while switching between nanoserver and windowsservercore

+            #$bbCount = $(& "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" images | Select-String "busybox" | Measure-Object -line).Lines

+            #$ErrorActionPreference = "Stop"

+            #if (-not($LastExitCode -eq 0)) {

+            #    Throw "ERROR: Could not determine if busybox image is present"

+            #}

+            #if ($bbCount -eq 0) {

+                Write-Host -ForegroundColor Green "INFO: Building busybox"

+                $ErrorActionPreference = "SilentlyContinue"

+    

+                # This is a temporary hack for nanoserver

+                if ($env:WINDOWS_BASE_IMAGE -ne "microsoft/windowsservercore") {

+                    Write-Host -ForegroundColor Red "HACK HACK HACK - Building 64-bit nanoserver busybox image"

+                    $(& "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" build -t busybox https://raw.githubusercontent.com/jhowardmsft/busybox64/master/Dockerfile | Out-Host)

+                } else {

+                    $(& "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" build -t busybox https://raw.githubusercontent.com/jhowardmsft/busybox/master/Dockerfile | Out-Host)

+                }

+                $ErrorActionPreference = "Stop"

+                if (-not($LastExitCode -eq 0)) {

+                    Throw "ERROR: Failed to build busybox image"

+                }

+            #}

-            # This is a temporary hack for nanoserver

-            if ($env:WINDOWS_BASE_IMAGE -ne "microsoft/windowsservercore") {

-                Write-Host -ForegroundColor Red "HACK HACK HACK - Building 64-bit nanoserver busybox image"

-                $(& "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" build -t busybox https://raw.githubusercontent.com/jhowardmsft/busybox64/master/Dockerfile | Out-Host)

-            } else {

-                $(& "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" build -t busybox https://raw.githubusercontent.com/jhowardmsft/busybox/master/Dockerfile | Out-Host)

+

+            Write-Host -ForegroundColor Green "INFO: Docker images of the daemon under test"

+            Write-Host 

+            $ErrorActionPreference = "SilentlyContinue"

+            & "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" images

+            $ErrorActionPreference = "Stop"

+            if ($LastExitCode -ne 0) {

+                Throw "ERROR: The daemon under test does not appear to be running."

+                $DumpDaemonLog=1

+            }

+            Write-Host

+        }

+    }

+

+    # Run the WCOW integration tests unless SKIP_INTEGRATION_TESTS is defined

+    if (($env:LCOW_MODE -eq $Null) -and ($env:LCOW_BASIC_MODE -eq $Null)) {

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

+            Write-Host -ForegroundColor Cyan "INFO: Running integration tests at $(Get-Date)..."

+            $ErrorActionPreference = "SilentlyContinue"

+    

+            # Location of the daemon under test.

+            $env:OrigDOCKER_HOST="$env:DOCKER_HOST"

+    

+            #https://blogs.technet.microsoft.com/heyscriptingguy/2011/09/20/solve-problems-with-external-command-lines-in-powershell/ is useful to see tokenising

+            $c = "go test "

+            $c += "`"-check.v`" "

+            if ($env:INTEGRATION_TEST_NAME -ne $null) { # Makes is quicker for debugging to be able to run only a subset of the integration tests

+                $c += "`"-check.f`" "

+                $c += "`"$env:INTEGRATION_TEST_NAME`" "

+                Write-Host -ForegroundColor Magenta "WARN: Only running integration tests matching $env:INTEGRATION_TEST_NAME"

+            }

+            $c += "`"-tags`" " + "`"autogen`" "

+            $c += "`"-check.timeout`" " + "`"10m`" "

+            $c += "`"-test.timeout`" " + "`"200m`" "

+    

+            if ($env:INTEGRATION_IN_CONTAINER -ne $null) {

+                Write-Host -ForegroundColor Green "INFO: Integration tests being run inside a container"

+                # Note we talk back through the containers gateway address

+                # And the ridiculous lengths we have to go to to get the default gateway address... (GetNetIPConfiguration doesn't work in nanoserver)

+                # I just could not get the escaping to work in a single command, so output $c to a file and run that in the container instead...

+                # Not the prettiest, but it works.

+                $c | Out-File -Force "$env:TEMP\binary\runIntegrationCLI.ps1"

+                $Duration= $(Measure-Command { & docker run `

+                                                        --rm `

+                                                        -e c=$c `

+                                                        --workdir "c`:\go\src\github.com\docker\docker\integration-cli" `

+                                                        -v "$env:TEMP\binary`:c:\target" `

+                                                        docker `

+                                                        "`$env`:PATH`='c`:\target;'+`$env:PATH`;  `$env:DOCKER_HOST`='tcp`://'+(ipconfig | select -last 1).Substring(39)+'`:2357'; c:\target\runIntegrationCLI.ps1" | Out-Host } )

+            } else  {

+                Write-Host -ForegroundColor Green "INFO: Integration tests being run from the host:"

+                cd "$env:SOURCES_DRIVE`:\$env:SOURCES_SUBDIR\src\github.com\docker\docker\integration-cli"

+                $env:DOCKER_HOST=$DASHH_CUT  

+                $env:PATH="$env:TEMP\binary;$env:PATH;"  # Force to use the test binaries, not the host ones.

+                Write-Host -ForegroundColor Green "INFO: $c"

+                Write-Host -ForegroundColor Green "INFO: DOCKER_HOST at $DASHH_CUT"

+                # Explicit to not use measure-command otherwise don't get output as it goes

+                $start=(Get-Date); Invoke-Expression $c; $Duration=New-Timespan -Start $start -End (Get-Date)

             }

             $ErrorActionPreference = "Stop"

             if (-not($LastExitCode -eq 0)) {

-                Throw "ERROR: Failed to build busybox image"

+                Throw "ERROR: Integration tests failed at $(Get-Date). Duration`:$Duration"

             }

-        #}

-

-

-        Write-Host -ForegroundColor Green "INFO: Docker images of the daemon under test"

-        Write-Host

-        $ErrorActionPreference = "SilentlyContinue"

-        & "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" images

-        $ErrorActionPreference = "Stop"

-        if ($LastExitCode -ne 0) {

-            Throw "ERROR: The daemon under test does not appear to be running."

-            $DumpDaemonLog=1

+            Write-Host  -ForegroundColor Green "INFO: Integration tests ended at $(Get-Date). Duration`:$Duration"

+        } else {

+            Write-Host -ForegroundColor Magenta "WARN: Skipping integration tests"

         }

-        Write-Host

-    }

+    } else {

+        # The LCOW version of the tests here

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

+            Write-Host -ForegroundColor Cyan "INFO: Running LCOW tests at $(Get-Date)..."

-    # Run the integration tests unless SKIP_INTEGRATION_TESTS is defined

-    if ($env:SKIP_INTEGRATION_TESTS -eq $null) {

-        Write-Host -ForegroundColor Cyan "INFO: Running integration tests at $(Get-Date)..."

-        $ErrorActionPreference = "SilentlyContinue"

+            $ErrorActionPreference = "SilentlyContinue"

+    

+            # Location of the daemon under test.

+            $env:OrigDOCKER_HOST="$env:DOCKER_HOST"

-        # Location of the daemon under test.

-        $env:OrigDOCKER_HOST="$env:DOCKER_HOST"

-

-        #https://blogs.technet.microsoft.com/heyscriptingguy/2011/09/20/solve-problems-with-external-command-lines-in-powershell/ is useful to see tokenising

-        $c = "go test "

-        $c += "`"-tags`" " + "`"autogen`" "

-        $c += "./integration/..."

-

-        if ($env:INTEGRATION_IN_CONTAINER -ne $null) {

-            Write-Host -ForegroundColor Green "INFO: Integration tests being run inside a container"

-            # Note we talk back through the containers gateway address

-            # And the ridiculous lengths we have to go to to get the default gateway address... (GetNetIPConfiguration doesn't work in nanoserver)

-            # I just could not get the escaping to work in a single command, so output $c to a file and run that in the container instead...

-            # Not the prettiest, but it works.

-            $c | Out-File -Force "$env:TEMP\binary\runIntegration.ps1"

-            $Duration= $(Measure-Command { & docker run `

-                                                    --rm `

-                                                    -e c=$c `

-                                                    --workdir "c`:\go\src\github.com\docker\docker\" `

-                                                    -v "$env:TEMP\binary`:c:\target" `

-                                                    docker `

-                                                    "`$env`:PATH`='c`:\target;'+`$env:PATH`;  `$env:DOCKER_HOST`='tcp`://'+(ipconfig | select -last 1).Substring(39)+'`:2357'; c:\target\runIntegrationCLI.ps1" | Out-Host } )

-        } else  {

-            Write-Host -ForegroundColor Green "INFO: Integration tests being run from the host:"

-            #cd "$env:SOURCES_DRIVE`:\$env:SOURCES_SUBDIR\src\github.com\docker\docker\integration"

-            $env:DOCKER_HOST=$DASHH_CUT

-            $env:PATH="$env:TEMP\binary;$env:PATH;"  # Force to use the test binaries, not the host ones.

-            Write-Host -ForegroundColor Green "INFO: $c"

+            # Make sure we are pointing at the DUT

+            $env:DOCKER_HOST=$DASHH_CUT  

             Write-Host -ForegroundColor Green "INFO: DOCKER_HOST at $DASHH_CUT"

-            # Explicit to not use measure-command otherwise don't get output as it goes

-            $start=(Get-Date); Invoke-Expression $c; $Duration=New-Timespan -Start $start -End (Get-Date)

-        }

-        $ErrorActionPreference = "Stop"

-        if (-not($LastExitCode -eq 0)) {

-            Throw "ERROR: Integration tests failed at $(Get-Date). Duration`:$Duration"

-        }

-        Write-Host  -ForegroundColor Green "INFO: Integration tests ended at $(Get-Date). Duration`:$Duration"

-    }else {

-        Write-Host -ForegroundColor Magenta "WARN: Skipping integration tests"

-    }

-    # Run the integration tests unless SKIP_INTEGRATION_TESTS is defined

-    if ($env:SKIP_INTEGRATION_TESTS -eq $null) {

-        Write-Host -ForegroundColor Cyan "INFO: Running integration cli tests at $(Get-Date)..."

-        $ErrorActionPreference = "SilentlyContinue"

+            # Force to use the test binaries, not the host ones.

+            $env:PATH="$env:TEMP\binary;$env:PATH;"  

+

+            if ($env:LCOW_BASIC_MODE -ne $null) {

+                $wc = New-Object net.webclient

+                try {

+                    Write-Host -ForegroundColor green "INFO: Downloading latest execution script..."

+                    $wc.Downloadfile("https://raw.githubusercontent.com/jhowardmsft/docker-w2wCIScripts/master/runCI/lcowbasicvalidation.ps1", "$env:TEMP\binary\lcowbasicvalidation.ps1")

+                } 

+                catch [System.Net.WebException]

+                {

+                    Throw ("Failed to download: $_")

+                }

-        # Location of the daemon under test.

-        $env:OrigDOCKER_HOST="$env:DOCKER_HOST"

+                # Explicit to not use measure-command otherwise don't get output as it goes

+                $ErrorActionPreference = "Stop"

+                $start=(Get-Date); Invoke-Expression "powershell $env:TEMP\binary\lcowbasicvalidation.ps1"; $lec=$lastExitCode; $Duration=New-Timespan -Start $start -End (Get-Date)

+                $Duration=New-Timespan -Start $start -End (Get-Date)

+                Write-Host  -ForegroundColor Green "INFO: LCOW tests ended at $(Get-Date). Duration`:$Duration"

+                if ($lec -ne 0) {

+                    Throw "LCOW validation tests failed"

+                }

+            } else {

+                #https://blogs.technet.microsoft.com/heyscriptingguy/2011/09/20/solve-problems-with-external-command-lines-in-powershell/ is useful to see tokenising

+                $c = "go test "

+                $c += "`"-check.v`" "

+                if ($env:INTEGRATION_TEST_NAME -ne $null) { # Makes is quicker for debugging to be able to run only a subset of the integration tests

+                    $c += "`"-check.f`" "

+                    $c += "`"$env:INTEGRATION_TEST_NAME`" "

+                    Write-Host -ForegroundColor Magenta "WARN: Only running LCOW integration tests matching $env:INTEGRATION_TEST_NAME"

+                }

+                $c += "`"-tags`" " + "`"autogen`" "

+                $c += "`"-check.timeout`" " + "`"10m`" "

+                $c += "`"-test.timeout`" " + "`"200m`" "

-        #https://blogs.technet.microsoft.com/heyscriptingguy/2011/09/20/solve-problems-with-external-command-lines-in-powershell/ is useful to see tokenising

-        $c = "go test "

-        $c += "`"-check.v`" "

-        if ($env:INTEGRATION_TEST_NAME -ne $null) { # Makes is quicker for debugging to be able to run only a subset of the integration tests

-            $c += "`"-check.f`" "

-            $c += "`"$env:INTEGRATION_TEST_NAME`" "

-            Write-Host -ForegroundColor Magenta "WARN: Only running integration tests matching $env:INTEGRATION_TEST_NAME"

-        }

-        $c += "`"-tags`" " + "`"autogen`" "

-        $c += "`"-check.timeout`" " + "`"10m`" "

-        $c += "`"-test.timeout`" " + "`"200m`" "

-

-        if ($env:INTEGRATION_IN_CONTAINER -ne $null) {

-            Write-Host -ForegroundColor Green "INFO: Integration tests being run inside a container"

-            # Note we talk back through the containers gateway address

-            # And the ridiculous lengths we have to go to to get the default gateway address... (GetNetIPConfiguration doesn't work in nanoserver)

-            # I just could not get the escaping to work in a single command, so output $c to a file and run that in the container instead...

-            # Not the prettiest, but it works.

-            $c | Out-File -Force "$env:TEMP\binary\runIntegrationCLI.ps1"

-            $Duration= $(Measure-Command { & docker run `

-                                                    --rm `

-                                                    -e c=$c `

-                                                    --workdir "c`:\go\src\github.com\docker\docker\integration-cli" `

-                                                    -v "$env:TEMP\binary`:c:\target" `

-                                                    docker `

-                                                    "`$env`:PATH`='c`:\target;'+`$env:PATH`;  `$env:DOCKER_HOST`='tcp`://'+(ipconfig | select -last 1).Substring(39)+'`:2357'; c:\target\runIntegrationCLI.ps1" | Out-Host } )

-        } else  {

-            Write-Host -ForegroundColor Green "INFO: Integration tests being run from the host:"

-            cd "$env:SOURCES_DRIVE`:\$env:SOURCES_SUBDIR\src\github.com\docker\docker\integration-cli"

-            $env:DOCKER_HOST=$DASHH_CUT

-            $env:PATH="$env:TEMP\binary;$env:PATH;"  # Force to use the test binaries, not the host ones.

-            Write-Host -ForegroundColor Green "INFO: $c"

-            Write-Host -ForegroundColor Green "INFO: DOCKER_HOST at $DASHH_CUT"

-            # Explicit to not use measure-command otherwise don't get output as it goes

-            $start=(Get-Date); Invoke-Expression $c; $Duration=New-Timespan -Start $start -End (Get-Date)

-        }

-        $ErrorActionPreference = "Stop"

-        if (-not($LastExitCode -eq 0)) {

-            Throw "ERROR: Integration tests failed at $(Get-Date). Duration`:$Duration"

+                Write-Host -ForegroundColor Green "INFO: LCOW Integration tests being run from the host:"

+                cd "$env:SOURCES_DRIVE`:\$env:SOURCES_SUBDIR\src\github.com\docker\docker\integration-cli"

+                Write-Host -ForegroundColor Green "INFO: $c"

+                Write-Host -ForegroundColor Green "INFO: DOCKER_HOST at $DASHH_CUT"

+                # Explicit to not use measure-command otherwise don't get output as it goes

+                $start=(Get-Date); Invoke-Expression $c; $Duration=New-Timespan -Start $start -End (Get-Date)

+

+            }

+            $ErrorActionPreference = "Stop"

+            if (-not($LastExitCode -eq 0)) {

+                Throw "ERROR: Integration tests failed at $(Get-Date). Duration`:$Duration"

+            }

+            Write-Host  -ForegroundColor Green "INFO: Integration tests ended at $(Get-Date). Duration`:$Duration"

+        } else {

+            Write-Host -ForegroundColor Magenta "WARN: Skipping LCOW tests"

         }

-        Write-Host  -ForegroundColor Green "INFO: Integration tests ended at $(Get-Date). Duration`:$Duration"

-    }else {

-        Write-Host -ForegroundColor Magenta "WARN: Skipping integration tests"

     }

     # Docker info now to get counts (after or if jjh/containercounts is merged)

     if ($daemonStarted -eq 1) {

         Write-Host -ForegroundColor Green "INFO: Docker info of the daemon under test at end of run"

-        Write-Host

+        Write-Host 

         $ErrorActionPreference = "SilentlyContinue"

         & "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" info

         $ErrorActionPreference = "Stop"

@@ -845,16 +935,14 @@ Try {

     }

     # Stop the daemon under test

-    if ($daemonStarted -eq 1) {

-        if (Test-Path "$env:TEMP\docker.pid") {

-            $p=Get-Content "$env:TEMP\docker.pid" -raw

-            if ($p -ne $null) {

-                Write-Host -ForegroundColor green "INFO: Stopping daemon under test"

-                taskkill -f -t -pid $p

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

-                #sleep 5

-            }

+    if (Test-Path "$env:TEMP\docker.pid") {

+        $p=Get-Content "$env:TEMP\docker.pid" -raw

+        if (($p -ne $null) -and ($daemonStarted -eq 1)) {

+            Write-Host -ForegroundColor green "INFO: Stopping daemon under test"

+            taskkill -f -t -pid $p

+            #sleep 5

         }

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

     }

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

@@ -862,18 +950,19 @@ Try {

 Catch [Exception] {

     $FinallyColour="Red"

     Write-Host -ForegroundColor Red ("`r`n`r`nERROR: Failed '$_' at $(Get-Date)")

+    Write-Host -ForegroundColor Red ($_.InvocationInfo.PositionMessage)

     Write-Host "`n`n"