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