Browse Source

Merge pull request #396 from thaJeztah/19.03_backport_update_moved_repositories

[19.03 backport] Update links/references to transferred repositories
Andrew Hsu 5 years ago
parent
commit
5787ef7e9c
4 changed files with 14 additions and 14 deletions
  1. 4 4
      Dockerfile.windows
  2. 2 2
      Jenkinsfile
  3. 1 1
      docs/contributing/software-req-win.md
  4. 7 7
      hack/ci/windows.ps1

+ 4 - 4
Dockerfile.windows

@@ -147,7 +147,7 @@
 # The docker integration tests do not currently run in a container on Windows, predominantly
 # 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.
 # 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 
 # 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.
 #
 #
 # -----------------------------------------------------------------------------------------
 # -----------------------------------------------------------------------------------------
 
 
@@ -218,13 +218,13 @@ RUN `
   Download-File "https://golang.org/dl/go${dlGoVersion}.windows-amd64.zip" C:\go.zip; `
   Download-File "https://golang.org/dl/go${dlGoVersion}.windows-amd64.zip" C:\go.zip; `
   `
   `
   Write-Host INFO: Downloading compiler 1 of 3...; `
   Write-Host INFO: Downloading compiler 1 of 3...; `
-  Download-File https://raw.githubusercontent.com/jhowardmsft/docker-tdmgcc/master/gcc.zip C:\gcc.zip; `
+  Download-File https://raw.githubusercontent.com/moby/docker-tdmgcc/master/gcc.zip C:\gcc.zip; `
   `
   `
   Write-Host INFO: Downloading compiler 2 of 3...; `
   Write-Host INFO: Downloading compiler 2 of 3...; `
-  Download-File https://raw.githubusercontent.com/jhowardmsft/docker-tdmgcc/master/runtime.zip C:\runtime.zip; `
+  Download-File https://raw.githubusercontent.com/moby/docker-tdmgcc/master/runtime.zip C:\runtime.zip; `
   `
   `
   Write-Host INFO: Downloading compiler 3 of 3...; `
   Write-Host INFO: Downloading compiler 3 of 3...; `
-  Download-File https://raw.githubusercontent.com/jhowardmsft/docker-tdmgcc/master/binutils.zip C:\binutils.zip; `
+  Download-File https://raw.githubusercontent.com/moby/docker-tdmgcc/master/binutils.zip C:\binutils.zip; `
   `
   `
   Write-Host INFO: Extracting git...; `
   Write-Host INFO: Extracting git...; `
   Expand-Archive C:\gitsetup.zip C:\git-tmp; `
   Expand-Archive C:\gitsetup.zip C:\git-tmp; `

+ 2 - 2
Jenkinsfile

@@ -786,7 +786,7 @@ pipeline {
                                 powershell '''
                                 powershell '''
                                 $ErrorActionPreference = 'Stop'
                                 $ErrorActionPreference = 'Stop'
                                 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
                                 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-                                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
+                                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
                                 ./hack/ci/windows.ps1
                                 ./hack/ci/windows.ps1
                                 exit $LastExitCode
                                 exit $LastExitCode
                                 '''
                                 '''
@@ -846,7 +846,7 @@ pipeline {
                             steps {
                             steps {
                                 powershell '''
                                 powershell '''
                                 $ErrorActionPreference = 'Stop'
                                 $ErrorActionPreference = 'Stop'
-                                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
+                                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
                                 ./hack/ci/windows.ps1
                                 ./hack/ci/windows.ps1
                                 exit $LastExitCode
                                 exit $LastExitCode
                                 '''
                                 '''

+ 1 - 1
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,
 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.
 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
 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
 ## Where to go next
 
 

+ 7 - 7
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)
 # Jenkins CI scripts for Windows to Windows CI (Powershell Version)
 # By John Howard (@jhowardmsft) January 2016 - bash version; July 2016 Ported to PowerShell
 # 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:
 # Jenkins Integration. Add a Windows Powershell build step as follows:
 #
 #
 #    Write-Host -ForegroundColor green "INFO: Jenkins build step starting"
 #    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"
 #    $CISCRIPT_LOCAL_LOCATION = "$env:TEMP\executeCI.ps1"
 #    Write-Host -ForegroundColor green "INFO: Removing cached execution script"
 #    Write-Host -ForegroundColor green "INFO: Removing cached execution script"
 #    Remove-Item $CISCRIPT_LOCAL_LOCATION -Force -ErrorAction SilentlyContinue 2>&1 | Out-Null
 #    Remove-Item $CISCRIPT_LOCAL_LOCATION -Force -ErrorAction SilentlyContinue 2>&1 | Out-Null
@@ -800,7 +800,7 @@ Try {
             #if ($bbCount -eq 0) {
             #if ($bbCount -eq 0) {
                 Write-Host -ForegroundColor Green "INFO: Building busybox"
                 Write-Host -ForegroundColor Green "INFO: Building busybox"
                 $ErrorActionPreference = "SilentlyContinue"
                 $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"
                 $ErrorActionPreference = "Stop"
                 if (-not($LastExitCode -eq 0)) {
                 if (-not($LastExitCode -eq 0)) {
                     Throw "ERROR: Failed to build busybox image"
                     Throw "ERROR: Failed to build busybox image"
@@ -907,7 +907,7 @@ Try {
                 $wc = New-Object net.webclient
                 $wc = New-Object net.webclient
                 try {
                 try {
                     Write-Host -ForegroundColor green "INFO: Downloading latest execution script..."
                     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]
                 catch [System.Net.WebException]
                 {
                 {