Browse code

Merge pull request #396 from thaJeztah/19.03_backport_update_moved_repositories

[19.03 backport] Update links/references to transferred repositories

Andrew Hsu authored on 2019/10/11 02:58:11
Showing 4 changed files
... ...
@@ -147,7 +147,7 @@
147 147
 # The docker integration tests do not currently run in a container on Windows, predominantly
148 148
 # due to Windows not supporting privileged mode, so anything using a volume would fail.
149 149
 # They (along with the rest of the docker CI suite) can be run using 
150
-# https://github.com/jhowardmsft/docker-w2wCIScripts/blob/master/runCI/Invoke-DockerCI.ps1.
150
+# https://github.com/kevpar/docker-w2wCIScripts/blob/master/runCI/Invoke-DockerCI.ps1.
151 151
 #
152 152
 # -----------------------------------------------------------------------------------------
153 153
 
... ...
@@ -218,13 +218,13 @@ RUN `
218 218
   Download-File "https://golang.org/dl/go${dlGoVersion}.windows-amd64.zip" C:\go.zip; `
219 219
   `
220 220
   Write-Host INFO: Downloading compiler 1 of 3...; `
221
-  Download-File https://raw.githubusercontent.com/jhowardmsft/docker-tdmgcc/master/gcc.zip C:\gcc.zip; `
221
+  Download-File https://raw.githubusercontent.com/moby/docker-tdmgcc/master/gcc.zip C:\gcc.zip; `
222 222
   `
223 223
   Write-Host INFO: Downloading compiler 2 of 3...; `
224
-  Download-File https://raw.githubusercontent.com/jhowardmsft/docker-tdmgcc/master/runtime.zip C:\runtime.zip; `
224
+  Download-File https://raw.githubusercontent.com/moby/docker-tdmgcc/master/runtime.zip C:\runtime.zip; `
225 225
   `
226 226
   Write-Host INFO: Downloading compiler 3 of 3...; `
227
-  Download-File https://raw.githubusercontent.com/jhowardmsft/docker-tdmgcc/master/binutils.zip C:\binutils.zip; `
227
+  Download-File https://raw.githubusercontent.com/moby/docker-tdmgcc/master/binutils.zip C:\binutils.zip; `
228 228
   `
229 229
   Write-Host INFO: Extracting git...; `
230 230
   Expand-Archive C:\gitsetup.zip C:\git-tmp; `
... ...
@@ -786,7 +786,7 @@ pipeline {
786 786
                                 powershell '''
787 787
                                 $ErrorActionPreference = 'Stop'
788 788
                                 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
789
-                                Invoke-WebRequest https://github.com/jhowardmsft/docker-ci-zap/blob/master/docker-ci-zap.exe?raw=true -OutFile C:/Windows/System32/docker-ci-zap.exe
789
+                                Invoke-WebRequest https://github.com/moby/docker-ci-zap/blob/master/docker-ci-zap.exe?raw=true -OutFile C:/Windows/System32/docker-ci-zap.exe
790 790
                                 ./hack/ci/windows.ps1
791 791
                                 exit $LastExitCode
792 792
                                 '''
... ...
@@ -846,7 +846,7 @@ pipeline {
846 846
                             steps {
847 847
                                 powershell '''
848 848
                                 $ErrorActionPreference = 'Stop'
849
-                                Invoke-WebRequest https://github.com/jhowardmsft/docker-ci-zap/blob/master/docker-ci-zap.exe?raw=true -OutFile C:/Windows/System32/docker-ci-zap.exe
849
+                                Invoke-WebRequest https://github.com/moby/docker-ci-zap/blob/master/docker-ci-zap.exe?raw=true -OutFile C:/Windows/System32/docker-ci-zap.exe
850 850
                                 ./hack/ci/windows.ps1
851 851
                                 exit $LastExitCode
852 852
                                 '''
... ...
@@ -169,7 +169,7 @@ quit due to the use of console hooks which are not available.
169 169
 The docker integration tests do not currently run in a container on Windows,
170 170
 predominantly due to Windows not supporting privileged mode, so anything using a volume would fail.
171 171
 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.
173 173
 
174 174
 ## Where to go next
175 175
 
... ...
@@ -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.
5 5
 #
6 6
 # Jenkins CI scripts for Windows to Windows CI (Powershell Version)
7 7
 # By John Howard (@jhowardmsft) January 2016 - bash version; July 2016 Ported to PowerShell
... ...
@@ -110,7 +110,7 @@ Write-Host -ForegroundColor Red "-----------------------------------------------
110 110
 # Jenkins Integration. Add a Windows Powershell build step as follows:
111 111
 #
112 112
 #    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"
114 114
 #    $CISCRIPT_LOCAL_LOCATION = "$env:TEMP\executeCI.ps1"
115 115
 #    Write-Host -ForegroundColor green "INFO: Removing cached execution script"
116 116
 #    Remove-Item $CISCRIPT_LOCAL_LOCATION -Force -ErrorAction SilentlyContinue 2>&1 | Out-Null
... ...
@@ -800,7 +800,7 @@ Try {
800 800
             #if ($bbCount -eq 0) {
801 801
                 Write-Host -ForegroundColor Green "INFO: Building busybox"
802 802
                 $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)
804 804
                 $ErrorActionPreference = "Stop"
805 805
                 if (-not($LastExitCode -eq 0)) {
806 806
                     Throw "ERROR: Failed to build busybox image"
... ...
@@ -907,7 +907,7 @@ Try {
907 907
                 $wc = New-Object net.webclient
908 908
                 try {
909 909
                     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")
911 911
                 } 
912 912
                 catch [System.Net.WebException]
913 913
                 {