Automerge upstream/master

ibmruntimes · Sep 1, 2023 · 0fbb72a · 0fbb72a
2 parents 0dcb6b2 + 36de928
commit 0fbb72a
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy
@@ -148,6 +148,12 @@ class Builder implements Serializable {
             cleanWsAfter = platformCleanWorkspaceAfterBuild
         }
 
+        // We need to ensure that _adopt is stripped from any tags used in hotspot variant builds, as *_adopt tags do not exist upstream.
+        def adjustedScmReference = scmReference
+        if (variant.equals("hotspot")) {
+            adjustedScmReference = scmReference - ('_adopt')
+        }
+
         return new IndividualBuildConfig(
             JAVA_TO_BUILD: javaToBuild,
             ARCHITECTURE: platformConfig.arch as String,
@@ -156,7 +162,7 @@ class Builder implements Serializable {
             TEST_LIST: testList,
             DYNAMIC_LIST: dynamicList,
             NUM_MACHINES: numMachines,
-            SCM_REF: scmReference,
+            SCM_REF: adjustedScmReference,
             BUILD_REF: buildReference,
             CI_REF: ciReference,
             HELPER_REF: helperReference,