Reformat tags for hotspot builds to ensure they match upstream tags (a…

…doptium#801)

The problem we're fixing here is that the tag-specific ea builds of jdk21 are failing when building the hotspot (NOT Temurin) variant, because we're seeking a specific tagged level which IS present at Adoptium, but is NOT present when we clone directly from the upstream OpenJDK source repos.

In short, we need to remove the "_adopt" bit from hotspot-variant builds before they will work.

This change does that in a way that lets us continue to execute the hotspot builds with the same pipeline job as the Temurin builds.

Signed-off-by: Adam Farley <adfarley@redhat.com>

pipelines/build/common/build_base_file.groovy

@@ -146,6 +146,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,
@@ -154,7 +160,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,