diff --git a/cicd/internal/flags/it-flags.go b/cicd/internal/flags/it-flags.go index 176dbf83da..1aa55e9a08 100644 --- a/cicd/internal/flags/it-flags.go +++ b/cicd/internal/flags/it-flags.go @@ -147,7 +147,7 @@ func StaticOracleSysPassword() string { func UnifiedWorkerHarnessContainerImage() string { if dUnifiedWorkerHarnessContainerImage != "" { - return "-Duw_staging_experiments=true -DunifiedWorker=true -DunifiedWorkerHarnessContainerImage=" + dUnifiedWorkerHarnessContainerImage + return "-DunifiedWorkerHarnessContainerImage=" + dUnifiedWorkerHarnessContainerImage } return "" } 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 index d1b0425016..e3f70e4562 100644 --- 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 @@ -488,27 +488,29 @@ protected LaunchInfo launchTemplate( && !templateMetadata.flexContainerName().isEmpty(); // Property allows testing with Runner v2 / Unified Worker - if (System.getProperty("unifiedWorker") != null) { + String unifiedWorkerHarnessContainerImage = + System.getProperty("unifiedWorkerHarnessContainerImage"); + if (System.getProperty("unifiedWorker") != null || unifiedWorkerHarnessContainerImage != null) { appendExperiment(options, "use_runner_v2"); if (System.getProperty("sdkContainerImage") != null) { options.addParameter("sdkContainerImage", System.getProperty("sdkContainerImage")); } - if (System.getProperty("unifiedWorkerHarnessContainerImage") != null) { + if (unifiedWorkerHarnessContainerImage != null) { appendExperiment( options, "runner_harness_container_image=" + System.getProperty("unifiedWorkerHarnessContainerImage")); } - } - - if (System.getProperty("uw_staging_experiments") != null) { - appendExperiment(options, "disable_worker_rolling_upgrade"); - appendExperiment(options, "use_beam_bq_sink"); - appendExperiment(options, "beam_fn_api"); - appendExperiment(options, "use_unified_worker"); - appendExperiment(options, "use_portable_job_submission"); - appendExperiment(options, "worker_region=" + REGION); + if (System.getProperty("uwStagingExperiments") != null + || unifiedWorkerHarnessContainerImage != null) { + appendExperiment(options, "disable_worker_rolling_upgrade"); + appendExperiment(options, "use_beam_bq_sink"); + appendExperiment(options, "beam_fn_api"); + appendExperiment(options, "use_unified_worker"); + appendExperiment(options, "use_portable_job_submission"); + appendExperiment(options, "worker_region=" + REGION); + } } if (System.getProperty("enableCleanupState") != null) {