Update openjdk_tests

gdams · web-flow · commit 5f260b9bac43 · 2024-10-12T10:11:33.000+01:00
diff --git a/buildenv/jenkins/openjdk_tests b/buildenv/jenkins/openjdk_tests
@@ -458,7 +458,7 @@ def runTest() {
             }
         }
         jenkinsfile = load "${WORKSPACE}/aqa-tests/buildenv/jenkins/JenkinsfileBase"
-        if (CLOUD_PROVIDER.equals('azure')) {
+        if (LABEL.contains('ci.agent.dynamic') && CLOUD_PROVIDER.equals('azure')) {
             //Set dockerimage for azure agent. Fyre has stencil to setup the right environment
             docker.image('ghcr.io/adoptium/test-containers:ubuntu2204').pull()
             docker.image('ghcr.io/adoptium/test-containers:ubuntu2204').inside {

Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,7 @@ def runTest() {`
`458`	`458`	`}`
`459`	`459`	`}`
`460`	`460`	`jenkinsfile = load "${WORKSPACE}/aqa-tests/buildenv/jenkins/JenkinsfileBase"`
`461`		`- if (CLOUD_PROVIDER.equals('azure')) {`
	`461`	`+ if (LABEL.contains('ci.agent.dynamic') && CLOUD_PROVIDER.equals('azure')) {`
`462`	`462`	`//Set dockerimage for azure agent. Fyre has stencil to setup the right environment`
`463`	`463`	`docker.image('ghcr.io/adoptium/test-containers:ubuntu2204').pull()`
`464`	`464`	`docker.image('ghcr.io/adoptium/test-containers:ubuntu2204').inside {`