From 5175ed54e58d2027e54571ef384eed54626f6c89 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 26 Sep 2019 12:00:43 +0200 Subject: [PATCH] hack/ci/windows.ps1 update references to repositories that were moved Also updated the related docs. Signed-off-by: Sebastiaan van Stijn --- docs/contributing/software-req-win.md | 2 +- hack/ci/windows.ps1 | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/contributing/software-req-win.md b/docs/contributing/software-req-win.md index 21473dfb3c..55b370003f 100644 --- a/docs/contributing/software-req-win.md +++ b/docs/contributing/software-req-win.md @@ -169,7 +169,7 @@ quit due to the use of console hooks which are not available. The docker integration tests do not currently run in a container on Windows, predominantly due to Windows not supporting privileged mode, so anything using a volume would fail. They (along with the rest of the docker CI suite) can be run using -https://github.com/jhowardmsft/docker-w2wCIScripts/blob/master/runCI/Invoke-DockerCI.ps1. +https://github.com/kevpar/docker-w2wCIScripts/blob/master/runCI/Invoke-DockerCI.ps1. ## Where to go next diff --git a/hack/ci/windows.ps1 b/hack/ci/windows.ps1 index 1bf2fe59e2..3bf951a4cb 100644 --- a/hack/ci/windows.ps1 +++ b/hack/ci/windows.ps1 @@ -1,7 +1,7 @@ -# 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. +# WARNING: When editing this file, consider submitting a PR to +# https://github.com/kevpar/docker-w2wCIScripts/blob/master/runCI/executeCI.ps1, and make sure that +# https://github.com/kevpar/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 @@ -110,7 +110,7 @@ Write-Host -ForegroundColor Red "----------------------------------------------- # Jenkins Integration. Add a Windows Powershell build step as follows: # # Write-Host -ForegroundColor green "INFO: Jenkins build step starting" -# $CISCRIPT_DEFAULT_LOCATION = "https://raw.githubusercontent.com/jhowardmsft/docker-w2wCIScripts/master/runCI/executeCI.ps1" +# $CISCRIPT_DEFAULT_LOCATION = "https://raw.githubusercontent.com/moby/moby/master/hack/ci/windows.ps1" # $CISCRIPT_LOCAL_LOCATION = "$env:TEMP\executeCI.ps1" # Write-Host -ForegroundColor green "INFO: Removing cached execution script" # Remove-Item $CISCRIPT_LOCAL_LOCATION -Force -ErrorAction SilentlyContinue 2>&1 | Out-Null @@ -800,7 +800,7 @@ Try { #if ($bbCount -eq 0) { Write-Host -ForegroundColor Green "INFO: Building busybox" $ErrorActionPreference = "SilentlyContinue" - $(& "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" build -t busybox https://raw.githubusercontent.com/jhowardmsft/busybox/v1.1/Dockerfile | Out-Host) + $(& "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" build -t busybox https://raw.githubusercontent.com/moby/busybox/v1.1/Dockerfile | Out-Host) $ErrorActionPreference = "Stop" if (-not($LastExitCode -eq 0)) { Throw "ERROR: Failed to build busybox image" @@ -907,7 +907,7 @@ Try { $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") + $wc.Downloadfile("https://raw.githubusercontent.com/kevpar/docker-w2wCIScripts/master/runCI/lcowbasicvalidation.ps1", "$env:TEMP\binary\lcowbasicvalidation.ps1") } catch [System.Net.WebException] {