Merge pull request #13 from couchbaselabs/rponton/AgentMasterNone

jeffrymorris · web-flow · commit ef6e695645da · 2021-07-22T17:12:49.000-07:00
Remove dependency on master agent to prevent stuck builds.
diff --git a/dotnet/sdk/build-pipeline.groovy b/dotnet/sdk/build-pipeline.groovy
@@ -46,7 +46,7 @@ pipeline {
             }
         }
         stage("prepare and validate") {
-            agent { label "centos6||centos7||ubuntu16||ubuntu14" }
+            agent { label "centos6||centos7||ubuntu16||ubuntu14||ubuntu20" }
             steps {
 
 				echo "Branch: ${GERRIT_BRANCH}"
@@ -73,13 +73,11 @@ pipeline {
             }
         }
         stage("build") {
-            agent { label "master" }
             steps {
                 doBuilds(PLATFORMS, DOTNET_SDK_VERSION, BRANCH, ALL_SUPPORTED_SDK_VERSIONS)
             }
         }
         stage("unit-test") {
-            agent { label "master" }
             steps {
                 doUnitTests(PLATFORMS, DOTNET_SDK_VERSION, BRANCH, ALL_SUPPORTED_SDK_VERSIONS)
             }
@@ -234,14 +232,14 @@ def doUnitTests(PLATFORMS, DOTNET_SDK_VERSION, BRANCH, ALL_SUPPORTED_SDK_VERSION
                                 batWithEcho("%TEMP%\\cbnc\\deps\\dotnet-core-sdk-${DOTNET_SDK_VERSION}\\dotnet test --test-adapter-path:. --logger:junit couchbase-net-client\\tests\\Couchbase.UnitTests\\Couchbase.UnitTests.csproj -f net5.0 --no-build")
                             }
                             finally {
-                                junit allowEmptyResults: true, testResults: "couchbase-net-client\\tests\\Couchbase.UnitTests\\TestResults\\TestResults.xml"
+                                junit allowEmptyResults: false, testResults: "couchbase-net-client\\tests\\Couchbase.UnitTests\\TestResults\\TestResults.xml"
                             }
                         } else {
                             try {
                                 shWithEcho("deps/dotnet-core-sdk-${DOTNET_SDK_VERSION}/dotnet test --test-adapter-path:. --logger:junit couchbase-net-client/tests/Couchbase.UnitTests/Couchbase.UnitTests.csproj -f net5.0 --no-build")
                             }
                             finally {
-                                junit  allowEmptyResults: true, testResults: "couchbase-net-client/tests/Couchbase.UnitTests/TestResults/TestResults.xml"
+                                junit  allowEmptyResults: false, testResults: "couchbase-net-client/tests/Couchbase.UnitTests/TestResults/TestResults.xml"
                             }
                         }
                     } else if (BRANCH == "release27") {

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ pipeline {`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`stage("prepare and validate") {`
`49`		`- agent { label "centos6\|\|centos7\|\|ubuntu16\|\|ubuntu14" }`
	`49`	`+ agent { label "centos6\|\|centos7\|\|ubuntu16\|\|ubuntu14\|\|ubuntu20" }`
`50`	`50`	`steps {`
`51`	`51`
`52`	`52`	`echo "Branch: ${GERRIT_BRANCH}"`
`@@ -73,13 +73,11 @@ pipeline {`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`	`stage("build") {`
`76`		`- agent { label "master" }`
`77`	`76`	`steps {`
`78`	`77`	`doBuilds(PLATFORMS, DOTNET_SDK_VERSION, BRANCH, ALL_SUPPORTED_SDK_VERSIONS)`
`79`	`78`	`}`
`80`	`79`	`}`
`81`	`80`	`stage("unit-test") {`
`82`		`- agent { label "master" }`
`83`	`81`	`steps {`
`84`	`82`	`doUnitTests(PLATFORMS, DOTNET_SDK_VERSION, BRANCH, ALL_SUPPORTED_SDK_VERSIONS)`
`85`	`83`	`}`
`@@ -234,14 +232,14 @@ def doUnitTests(PLATFORMS, DOTNET_SDK_VERSION, BRANCH, ALL_SUPPORTED_SDK_VERSION`
`234`	`232`	`batWithEcho("%TEMP%\\cbnc\\deps\\dotnet-core-sdk-${DOTNET_SDK_VERSION}\\dotnet test --test-adapter-path:. --logger:junit couchbase-net-client\\tests\\Couchbase.UnitTests\\Couchbase.UnitTests.csproj -f net5.0 --no-build")`
`235`	`233`	`}`
`236`	`234`	`finally {`
`237`		`- junit allowEmptyResults: true, testResults: "couchbase-net-client\\tests\\Couchbase.UnitTests\\TestResults\\TestResults.xml"`
	`235`	`+ junit allowEmptyResults: false, testResults: "couchbase-net-client\\tests\\Couchbase.UnitTests\\TestResults\\TestResults.xml"`
`238`	`236`	`}`
`239`	`237`	`} else {`
`240`	`238`	`try {`
`241`	`239`	`shWithEcho("deps/dotnet-core-sdk-${DOTNET_SDK_VERSION}/dotnet test --test-adapter-path:. --logger:junit couchbase-net-client/tests/Couchbase.UnitTests/Couchbase.UnitTests.csproj -f net5.0 --no-build")`
`242`	`240`	`}`
`243`	`241`	`finally {`
`244`		`- junit allowEmptyResults: true, testResults: "couchbase-net-client/tests/Couchbase.UnitTests/TestResults/TestResults.xml"`
	`242`	`+ junit allowEmptyResults: false, testResults: "couchbase-net-client/tests/Couchbase.UnitTests/TestResults/TestResults.xml"`
`245`	`243`	`}`
`246`	`244`	`}`
`247`	`245`	`} else if (BRANCH == "release27") {`