change unifiedWorkerHarnessContainerImage to test arg from experiment (GoogleCloudPlatform#2100)

Polber · web-flow · commit e68d100cfd6f · 2025-01-02T16:21:03.000-05:00
Signed-off-by: Jeffrey Kinard &lt;jeff@thekinards.com&gt;
diff --git a/.github/workflows/uw-tests.yml b/.github/workflows/uw-tests.yml
@@ -33,10 +33,9 @@ jobs:
           HARNESS_IMAGE: ${{ inputs.unifiedWorkerHarnessContainerImage }}
       - name: Checkout code
         uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2 # v4.0.0
-        with:
-          fetch-depth: 0
-          ref: ${{ steps.variables.outputs.releaseTag }}
-#           token: ${{ secrets.RELEASE_TOKEN }}
+#         with:
+#           fetch-depth: 0
+#           ref: ${{ steps.variables.outputs.releaseTag }}
       - name: Setup Environment
         id: setup-env
         uses: ./.github/actions/setup-env
diff --git a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/TemplateTestBase.java b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/TemplateTestBase.java
@@ -499,13 +499,11 @@ protected LaunchInfo launchTemplate(
         options.addParameter("sdkContainerImage", System.getProperty("sdkContainerImage"));
       }
       if (unifiedWorkerHarnessContainerImage != null) {
-        appendExperiment(
-            options,
-            "runner_harness_container_image="
-                + System.getProperty("unifiedWorkerHarnessContainerImage"));
+        options.addParameter(
+            "runner_harness_container_image",
+            System.getProperty("unifiedWorkerHarnessContainerImage"));
       }
-      if (System.getProperty("uwStagingExperiments") != null
-          || unifiedWorkerHarnessContainerImage != null) {
+      if (System.getProperty("uwStagingExperiments") != null) {
         appendExperiment(options, "disable_worker_rolling_upgrade");
         appendExperiment(options, "use_beam_bq_sink");
         appendExperiment(options, "beam_fn_api");
