Skip to content

Simplify uw-tests logic #1884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Polber merged 1 commit into from
Sep 20, 2024
Merged

Simplify uw-tests logic #1884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cicd/internal/flags/it-flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
}
24 changes: 13 additions & 11 deletions it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/TemplateTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down