improve label detection

adoptium · Oct 16, 2024 · 6a1e047 · 6a1e047
1 parent bd8dc33
commit 6a1e047
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/buildenv/jenkins/openjdk_tests b/buildenv/jenkins/openjdk_tests
@@ -458,8 +458,12 @@ def runTest() {
             }
         }
         jenkinsfile = load "${WORKSPACE}/aqa-tests/buildenv/jenkins/JenkinsfileBase"
-        if (LABEL.contains('ci.agent.dynamic') && CLOUD_PROVIDER.equals('azure')) {
-            //Set dockerimage for azure agent. Fyre has stencil to setup the right environment
+        // Check the node for full set of labels
+        def JobHelper = library(identifier: 'openjdk-jenkins-helper@master').JobHelper
+        def labels = JobHelper.getLabels(NODE_NAME)
+
+        if (LABEL.contains('ci.agent.dynamic') && labels.contains('dynamicAzure')) {
+            // 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 {
                 jenkinsfile.testBuild()