From 3dee4919b30742b08baa0109a41bbd682e22ac3d Mon Sep 17 00:00:00 2001 From: Stephen Brawner Date: Fri, 10 Apr 2020 21:32:41 -0700 Subject: [PATCH] Add exit on errorlevel clauses to windows job template --- job_templates/ci_job.xml.em | 6 +++--- job_templates/packaging_job.xml.em | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/job_templates/ci_job.xml.em b/job_templates/ci_job.xml.em index 00b582ee5..cb20ca524 100644 --- a/job_templates/ci_job.xml.em +++ b/job_templates/ci_job.xml.em @@ -364,7 +364,7 @@ rem "Finding the ReleaseId is much easier with powershell than cmd" powershell $(Get-ItemProperty 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion').ReleaseId > release_id.txt set /p RELEASE_ID=< release_id.txt set BUILD_ARGS=--build-arg WINDOWS_RELEASE_ID=%RELEASE_ID% -docker build %BUILD_ARGS% -t %CONTAINER_NAME% -f %DOCKERFILE% windows_docker_resources +docker build %BUILD_ARGS% -t %CONTAINER_NAME% -f %DOCKERFILE% windows_docker_resources || exit /b %ERRORLEVEL% echo "# END SECTION" echo "# BEGIN SECTION: Determine arguments" @@ -442,8 +442,8 @@ powershell -Command "if ($(docker ps -q) -ne $null) { docker stop $(docker ps -q rem If isolated_network doesn't already exist, create it set NETWORK_NAME=isolated_network -docker network inspect %NETWORK_NAME% 2>nul 1>nul || docker network create -d nat -o com.docker.network.bridge.enable_icc=false %NETWORK_NAME% -docker run --isolation=process --rm --net=%NETWORK_NAME% -e ROS_DOMAIN_ID=1 -e CI_ARGS="%CI_ARGS%" -v "%cd%":"C:\ci" %CONTAINER_NAME% +docker network inspect %NETWORK_NAME% 2>nul 1>nul || docker network create -d nat -o com.docker.network.bridge.enable_icc=false %NETWORK_NAME% || exit /b %ERRORLEVEL% +docker run --isolation=process --rm --net=%NETWORK_NAME% -e ROS_DOMAIN_ID=1 -e CI_ARGS="%CI_ARGS%" -v "%cd%":"C:\ci" %CONTAINER_NAME% || exit /b %ERRORLEVEL% echo "# END SECTION" @[else]@ @{ assert False, 'Unknown os_name: ' + os_name }@ diff --git a/job_templates/packaging_job.xml.em b/job_templates/packaging_job.xml.em index 3739914a1..33aedab31 100644 --- a/job_templates/packaging_job.xml.em +++ b/job_templates/packaging_job.xml.em @@ -342,7 +342,7 @@ rem "Finding the ReleaseId is much easier with powershell than cmd" powershell $(Get-ItemProperty 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion').ReleaseId > release_id.txt set /p RELEASE_ID=< release_id.txt set BUILD_ARGS=--build-arg WINDOWS_RELEASE_ID=%RELEASE_ID% -docker build %BUILD_ARGS% -t %CONTAINER_NAME% -f %DOCKERFILE% windows_docker_resources +docker build %BUILD_ARGS% -t %CONTAINER_NAME% -f %DOCKERFILE% windows_docker_resources || exit /b %ERRORLEVEL% echo "# END SECTION" echo "# BEGIN SECTION: Determine arguments" @@ -408,8 +408,8 @@ powershell -Command "if ($(docker ps -q) -ne $null) { docker stop $(docker ps -q rem If isolated_network doesn't already exist, create it set NETWORK_NAME=isolated_network -docker network inspect %NETWORK_NAME% 2>nul 1>nul || docker network create -d nat -o com.docker.network.bridge.enable_icc=false %NETWORK_NAME% -docker run --isolation=process --rm --net=%NETWORK_NAME% -e ROS_DOMAIN_ID=1 -e CI_ARGS="%CI_ARGS%" -v "%cd%":"C:\ci" %CONTAINER_NAME% +docker network inspect %NETWORK_NAME% 2>nul 1>nul || docker network create -d nat -o com.docker.network.bridge.enable_icc=false %NETWORK_NAME% || exit /b %ERRORLEVEL% +docker run --isolation=process --rm --net=%NETWORK_NAME% -e ROS_DOMAIN_ID=1 -e CI_ARGS="%CI_ARGS%" -v "%cd%":"C:\ci" %CONTAINER_NAME% || exit /b %ERRORLEVEL% echo "# END SECTION" @[else]@ @{ assert False, 'Unknown os_name: ' + os_name }@