Rename runner to unified worker

Signed-off-by: Jeffrey Kinard <[email protected]>
GoogleCloudPlatform · Sep 20, 2024 · fd2a54f · fd2a54f
1 parent 8625934
commit fd2a54f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/uw-tests.yml b/.github/workflows/uw-tests.yml
@@ -3,8 +3,8 @@ name: Release
 on:
   workflow_dispatch:
     inputs:
-      runnerHarnessContainerImage:
-        description: 'Runner harness container image'
+      unifiedWorkerHarnessContainerImage:
+        description: 'Unified worker harness container image'
         type: string
         required: true
 
@@ -27,10 +27,10 @@ jobs:
       - name: Declare runner image and release tag
         id: variables
         run: |
-          echo "runnerHarnessContainerImage=${HARNESS_IMAGE}" >> $GITHUB_OUTPUT
+          echo "unifiedWorkerHarnessContainerImage=${HARNESS_IMAGE}" >> $GITHUB_OUTPUT
           echo "releaseTag=$(curl -s https://api.github.com/repos/GoogleCLoudPlatform/DataflowTemplates/releases/latest | jq '.tag_name' | sed 's/\"//g')" >> $GITHUB_OUTPUT
         env:
-          HARNESS_IMAGE: ${{ inputs.runnerHarnessContainerImage }}
+          HARNESS_IMAGE: ${{ inputs.unifiedWorkerHarnessContainerImage }}
       - name: Checkout code
         uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2 # v4.0.0
         with:
@@ -50,10 +50,10 @@ jobs:
           --it-private-connectivity="datastream-private-connect-us-central1" \
           --it-spanner-host="https://batch-spanner.googleapis.com" \
           --it-release=true \
-          --it-runner-harness-container-image=$HARNESS_IMAGE \
+          --it-unified-worker-harness-container-image=$HARNESS_IMAGE \
           --it-retry-failures=2
         env:
-          HARNESS_IMAGE: ${{ steps.variables.outputs.runnerHarnessContainerImage }}
+          HARNESS_IMAGE: ${{ steps.variables.outputs.unifiedWorkerHarnessContainerImage }}
       - name: Upload Site Report
         uses: ./.github/actions/publish-site-report
         with:

diff --git a/cicd/cmd/run-it-tests/main.go b/cicd/cmd/run-it-tests/main.go
@@ -74,7 +74,7 @@ func main() {
 		flags.CloudProxyMySqlPort(),
 		flags.CloudProxyPostgresPort(),
 		flags.CloudProxyPassword(),
-		flags.RunnerHarnessContainerImage())
+		flags.UnifiedWorkerHarnessContainerImage())
 	if err != nil {
 		log.Fatalf("%v\n", err)
 	}

diff --git a/cicd/internal/flags/it-flags.go b/cicd/internal/flags/it-flags.go
@@ -39,7 +39,7 @@ var (
 	dCloudProxyPassword          string
 	dOracleHost                  string
 	dCloudOracleSysPassword      string
-	dRunnerHarnessContainerImage string
+	dUnifiedWorkerHarnessContainerImage string
 )
 
 // Registers all it flags. Must be called before flag.Parse().
@@ -59,7 +59,7 @@ func RegisterItFlags() {
 	flag.StringVar(&dCloudProxyPassword, "it-cloud-proxy-password", "t>5xl%J(&qTK6?FaZ", "Password of static Cloud Auth Proxy")
 	flag.StringVar(&dOracleHost, "it-oracle-host", "10.128.0.90", "Hostname or IP address of static Oracle DB")
 	flag.StringVar(&dCloudOracleSysPassword, "it-oracle-sys-password", "oracle", "sys password of static Oracle DB")
-	flag.StringVar(&dRunnerHarnessContainerImage, "it-runner-harness-container-image", "", "Runner harness image to run tests against")
+	flag.StringVar(&dUnifiedWorkerHarnessContainerImage, "it-unified-worker-harness-container-image", "", "Runner harness image to run tests against")
 }
 
 func Region() string {
@@ -145,9 +145,9 @@ func StaticOracleSysPassword() string {
 	return "-DcloudOracleSysPassword=" + dCloudOracleSysPassword
 }
 
-func RunnerHarnessContainerImage() string {
-	if dRunnerHarnessContainerImage != "" {
-		return "-Duw_staging_experiments=true -DunifiedWorker=true -DrunnerHarnessContainerImage=" + dRunnerHarnessContainerImage
+func UnifiedWorkerContainerImage() string {
+	if dUnifiedWorkerContainerImage != "" {
+		return "-Duw_staging_experiments=true -DunifiedWorker=true -DunifiedWorkerHarnessContainerImage=" + dUnifiedWorkerContainerImage
 	}
 	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
@@ -494,10 +494,10 @@ protected LaunchInfo launchTemplate(
       if (System.getProperty("sdkContainerImage") != null) {
         options.addParameter("sdkContainerImage", System.getProperty("sdkContainerImage"));
       }
-      if (System.getProperty("runnerHarnessContainerImage") != null) {
+      if (System.getProperty("unifiedWorkerHarnessContainerImage") != null) {
         appendExperiment(
             options,
-            "runner_harness_container_image=" + System.getProperty("runnerHarnessContainerImage"));
+            "runner_harness_container_image=" + System.getProperty("unifiedWorkerHarnessContainerImage"));
       }
     }