kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

hack/ci/windows.ps1 update references to repositories that were moved

Browse source 
Also updated the related docs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-09-26 12:00:43 +02:00
parent 83fd212f2c
commit 5175ed54e5
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/contributing/software-req-win.md
View file

@ -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

14
hack/ci/windows.ps1
View file

@ -1,7 +1,7 @@
# WARNING WARNING WARNING - DO NOT EDIT THIS FILE IN JENKINS DIRECTLY. # WARNING: When editing this file, consider submitting a PR to
# SUBMIT A PR TO https://github.com/jhowardmsft/docker-w2wCIScripts/blob/master/runCI/executeCI.ps1, # https://github.com/kevpar/docker-w2wCIScripts/blob/master/runCI/executeCI.ps1, and make sure that
# AND MAKE SURE https://github.com/jhowardmsft/docker-w2wCIScripts/blob/master/runCI/Invoke-DockerCI.ps1 # https://github.com/kevpar/docker-w2wCIScripts/blob/master/runCI/Invoke-DockerCI.ps1 isn't broken.
# ISN'T BROKEN!!!!!!! VALIDATE USING A TEST CONTEXT IN JENKINS. THEN COPY/PASTE INTO JENKINS PRODUCTION. # 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]
{ {