Merge pull request #54 from pentaho/HNC-729

[HNC-729] - QAT pipeline should honor SLAVE_NODE_LABEL property
pentaho · Jul 22, 2024 · ccbd401 · ccbd401
2 parents 71dbd39 + ba453d4
commit ccbd401
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/org/hitachivantara/ci/stages/ItemWorkStage.groovy b/src/org/hitachivantara/ci/stages/ItemWorkStage.groovy
@@ -13,6 +13,7 @@ import org.hitachivantara.ci.jenkins.MinionHandler
 import static org.hitachivantara.ci.config.LibraryProperties.BUILD_RETRIES
 import static org.hitachivantara.ci.config.LibraryProperties.IGNORE_PIPELINE_FAILURE
 import static org.hitachivantara.ci.config.LibraryProperties.OVERRIDE_PARAMS
+import static org.hitachivantara.ci.config.LibraryProperties.SLAVE_NODE_LABEL
 
 class ItemWorkStage extends Stage {
 
@@ -89,10 +90,14 @@ class ItemWorkStage extends Stage {
 
     // Minion call
     if (allowMinions && buildData.useMinions) {
-      execution = new JobBuild(MinionHandler.getFullJobName(item))
-        .withParameters([
+      Map minionParams = [
           (OVERRIDE_PARAMS): "${MINION_STAGE}: ${id}"
-        ])
+      ]
+      if (buildData.isSet(SLAVE_NODE_LABEL)) {
+        minionParams.put(SLAVE_NODE_LABEL, "${buildData.getString(SLAVE_NODE_LABEL)}")
+      }
+      execution = new JobBuild(MinionHandler.getFullJobName(item))
+        .withParameters(minionParams)
         .getExecution()
     }
     // Local execution