Skip to content

Commit 6a1e047

Browse files
committed
improve label detection
1 parent bd8dc33 commit 6a1e047

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

Diff for: buildenv/jenkins/openjdk_tests

+6-2
Original file line numberDiff line numberDiff line change
@@ -458,8 +458,12 @@ def runTest() {
458458
}
459459
}
460460
jenkinsfile = load "${WORKSPACE}/aqa-tests/buildenv/jenkins/JenkinsfileBase"
461-
if (LABEL.contains('ci.agent.dynamic') && CLOUD_PROVIDER.equals('azure')) {
462-
//Set dockerimage for azure agent. Fyre has stencil to setup the right environment
461+
// Check the node for full set of labels
462+
def JobHelper = library(identifier: 'openjdk-jenkins-helper@master').JobHelper
463+
def labels = JobHelper.getLabels(NODE_NAME)
464+
465+
if (LABEL.contains('ci.agent.dynamic') && labels.contains('dynamicAzure')) {
466+
// Set dockerimage for azure agent. Fyre has stencil to setup the right environment
463467
docker.image('ghcr.io/adoptium/test-containers:ubuntu2204').pull()
464468
docker.image('ghcr.io/adoptium/test-containers:ubuntu2204').inside {
465469
jenkinsfile.testBuild()

0 commit comments

Comments
 (0)