From 879bac1b796fd5cb4a04499a543b8eb00e060d7e Mon Sep 17 00:00:00 2001 From: Manfred Endres Date: Thu, 31 Aug 2023 13:06:48 +0200 Subject: [PATCH] Move evaluation of testEnvironment in node block --- src/net/wooga/jenkins/pipeline/check/EnclosureCreator.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/net/wooga/jenkins/pipeline/check/EnclosureCreator.groovy b/src/net/wooga/jenkins/pipeline/check/EnclosureCreator.groovy index b35c958a..588c621e 100644 --- a/src/net/wooga/jenkins/pipeline/check/EnclosureCreator.groovy +++ b/src/net/wooga/jenkins/pipeline/check/EnclosureCreator.groovy @@ -14,13 +14,13 @@ class EnclosureCreator { } Closure withNodeAndEnv(Platform platform, PackedStep mainCls, Closure catchCls, PackedStep finallyCls) { - def testEnvironment = platform.testEnvironment + - ["TRAVIS_JOB_NUMBER=${buildNumber}.${platform.name.toUpperCase()}"] return { def platformLabels = platform.generateTestLabelsString() def nodeLabels = platformLabels && !platformLabels.empty ? "atlas && ${platform.generateTestLabelsString()}" : "atlas" jenkins.node(nodeLabels) { + def testEnvironment = platform.testEnvironment + + ["TRAVIS_JOB_NUMBER=${buildNumber}.${platform.name.toUpperCase()}"] jenkins.withEnv(testEnvironment) { try { mainCls.call()