From 10b606115ce980e0d1fe290ddad77e88dcc0a4eb Mon Sep 17 00:00:00 2001 From: George Adams Date: Wed, 16 Oct 2024 16:06:42 +0100 Subject: [PATCH] improve label detection --- buildenv/jenkins/openjdk_tests | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/buildenv/jenkins/openjdk_tests b/buildenv/jenkins/openjdk_tests index 3ae6bdf513..8a922252d1 100644 --- a/buildenv/jenkins/openjdk_tests +++ b/buildenv/jenkins/openjdk_tests @@ -458,11 +458,7 @@ def runTest() { } } jenkinsfile = load "${WORKSPACE}/aqa-tests/buildenv/jenkins/JenkinsfileBase" - // 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')) { + 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 {