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

Commit 9afaee9

Browse files
committed
hack/ci/windows.ps1 update references to repositories that were moved
Also updated the related docs. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 5175ed54e58d2027e54571ef384eed54626f6c89) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 3472e441c571126e88e42af08f830b3924071955 Component: engine
1 parent 327bc42 commit 9afaee9

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

components/engine/docs/contributing/software-req-win.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ quit due to the use of console hooks which are not available.
169169
The docker integration tests do not currently run in a container on Windows,
170170
predominantly due to Windows not supporting privileged mode, so anything using a volume would fail.
171171
They (along with the rest of the docker CI suite) can be run using
172-
https://github.com/jhowardmsft/docker-w2wCIScripts/blob/master/runCI/Invoke-DockerCI.ps1.
172+
https://github.com/kevpar/docker-w2wCIScripts/blob/master/runCI/Invoke-DockerCI.ps1.
173173

174174
## Where to go next
175175

components/engine/hack/ci/windows.ps1

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# WARNING WARNING WARNING - DO NOT EDIT THIS FILE IN JENKINS DIRECTLY.
2-
# SUBMIT A PR TO https://github.com/jhowardmsft/docker-w2wCIScripts/blob/master/runCI/executeCI.ps1,
3-
# AND MAKE SURE https://github.com/jhowardmsft/docker-w2wCIScripts/blob/master/runCI/Invoke-DockerCI.ps1
4-
# ISN'T BROKEN!!!!!!! VALIDATE USING A TEST CONTEXT IN JENKINS. THEN COPY/PASTE INTO JENKINS PRODUCTION.
1+
# WARNING: When editing this file, consider submitting a PR to
2+
# https://github.com/kevpar/docker-w2wCIScripts/blob/master/runCI/executeCI.ps1, and make sure that
3+
# https://github.com/kevpar/docker-w2wCIScripts/blob/master/runCI/Invoke-DockerCI.ps1 isn't broken.
4+
# Validate using a test context in Jenkins, then copy/paste into Jenkins production.
55
#
66
# Jenkins CI scripts for Windows to Windows CI (Powershell Version)
77
# By John Howard (@jhowardmsft) January 2016 - bash version; July 2016 Ported to PowerShell
@@ -110,7 +110,7 @@ Write-Host -ForegroundColor Red "-----------------------------------------------
110110
# Jenkins Integration. Add a Windows Powershell build step as follows:
111111
#
112112
# Write-Host -ForegroundColor green "INFO: Jenkins build step starting"
113-
# $CISCRIPT_DEFAULT_LOCATION = "https://raw.githubusercontent.com/jhowardmsft/docker-w2wCIScripts/master/runCI/executeCI.ps1"
113+
# $CISCRIPT_DEFAULT_LOCATION = "https://raw.githubusercontent.com/moby/moby/master/hack/ci/windows.ps1"
114114
# $CISCRIPT_LOCAL_LOCATION = "$env:TEMP\executeCI.ps1"
115115
# Write-Host -ForegroundColor green "INFO: Removing cached execution script"
116116
# Remove-Item $CISCRIPT_LOCAL_LOCATION -Force -ErrorAction SilentlyContinue 2>&1 | Out-Null
@@ -800,7 +800,7 @@ Try {
800800
#if ($bbCount -eq 0) {
801801
Write-Host -ForegroundColor Green "INFO: Building busybox"
802802
$ErrorActionPreference = "SilentlyContinue"
803-
$(& "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" build -t busybox https://raw.githubusercontent.com/jhowardmsft/busybox/v1.1/Dockerfile | Out-Host)
803+
$(& "$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" build -t busybox https://raw.githubusercontent.com/moby/busybox/v1.1/Dockerfile | Out-Host)
804804
$ErrorActionPreference = "Stop"
805805
if (-not($LastExitCode -eq 0)) {
806806
Throw "ERROR: Failed to build busybox image"
@@ -907,7 +907,7 @@ Try {
907907
$wc = New-Object net.webclient
908908
try {
909909
Write-Host -ForegroundColor green "INFO: Downloading latest execution script..."
910-
$wc.Downloadfile("https://raw.githubusercontent.com/jhowardmsft/docker-w2wCIScripts/master/runCI/lcowbasicvalidation.ps1", "$env:TEMP\binary\lcowbasicvalidation.ps1")
910+
$wc.Downloadfile("https://raw.githubusercontent.com/kevpar/docker-w2wCIScripts/master/runCI/lcowbasicvalidation.ps1", "$env:TEMP\binary\lcowbasicvalidation.ps1")
911911
}
912912
catch [System.Net.WebException]
913913
{

0 commit comments

Comments
 (0)