From 521586e04a7246036df255ded9bb0ea0ff7bea7a Mon Sep 17 00:00:00 2001
From: Jack McCluskey <34928439+jrmccluskey@users.noreply.github.com>
Date: Thu, 18 Jul 2024 15:06:17 -0400
Subject: [PATCH] Update Python artifact name in release process (#31933)

* Update Python artifact name in release process

* Change version references to 2.XX.0
---
 contributor-docs/release-guide.md             | 12 ++---
 release/src/main/scripts/run_rc_validation.sh | 48 +++++++++----------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/contributor-docs/release-guide.md b/contributor-docs/release-guide.md
index c0e8e7c67ce7..b3d3c77d25df 100644
--- a/contributor-docs/release-guide.md
+++ b/contributor-docs/release-guide.md
@@ -1006,18 +1006,18 @@ write to BigQuery, and create a cluster of machines for running containers (for
   In comment area, type in `Run Python ReleaseCandidate` to trigger validation.
 
 * **Python Leaderboard & GameStats**
-  * **Get staging RC** `wget https://dist.apache.org/repos/dist/dev/beam/2.5.0/* `
+  * **Get staging RC** `wget https://dist.apache.org/repos/dist/dev/beam/2.XX.0/* `
   * **Verify the hashes**
 
     ```
-    sha512sum -c apache-beam-2.5.0-python.tar.gz.sha512
-    sha512sum -c apache-beam-2.5.0-source-release.tar.gz.sha512
+    sha512sum -c apache_beam-2.XX.0-python.tar.gz.sha512
+    sha512sum -c apache_beam-2.XX.0-source-release.tar.gz.sha512
     ```
   * **Build SDK**
 
     ```
     sudo apt-get install unzip
-    unzip apache-beam-2.5.0-source-release.tar.gz
+    unzip apache_beam-2.XX.0-source-release.tar.gz
     python setup.py sdist
     ```
   * **Setup virtual environment**
@@ -1030,8 +1030,8 @@ write to BigQuery, and create a cluster of machines for running containers (for
   * **Install SDK**
 
     ```
-    pip install dist/apache-beam-2.5.0.tar.gz
-    pip install dist/apache-beam-2.5.0.tar.gz[gcp]
+    pip install dist/apache_beam-2.XX.0.tar.gz
+    pip install dist/apache_beam-2.XX.0.tar.gz[gcp]
     ```
   * **Setup GCP**
 
diff --git a/release/src/main/scripts/run_rc_validation.sh b/release/src/main/scripts/run_rc_validation.sh
index 0f2bfe4aaec2..91bfa9e2f8bb 100755
--- a/release/src/main/scripts/run_rc_validation.sh
+++ b/release/src/main/scripts/run_rc_validation.sh
@@ -300,14 +300,14 @@ if [[ ("$python_leaderboard_direct" = true \
   cd ${LOCAL_BEAM_DIR}
 
   echo "---------------------Downloading Python Staging RC----------------------------"
-  wget ${PYTHON_RC_DOWNLOAD_URL}/${RELEASE_VER}/python/apache-beam-${RELEASE_VER}.tar.gz
-  wget ${PYTHON_RC_DOWNLOAD_URL}/${RELEASE_VER}/python/apache-beam-${RELEASE_VER}.tar.gz.sha512
-  if [[ ! -f apache-beam-${RELEASE_VER}.tar.gz ]]; then
+  wget ${PYTHON_RC_DOWNLOAD_URL}/${RELEASE_VER}/python/apache_beam-${RELEASE_VER}.tar.gz
+  wget ${PYTHON_RC_DOWNLOAD_URL}/${RELEASE_VER}/python/apache_beam-${RELEASE_VER}.tar.gz.sha512
+  if [[ ! -f apache_beam-${RELEASE_VER}.tar.gz ]]; then
     { echo "Fail to download Python Staging RC files." ;exit 1; }
   fi
 
   echo "--------------------------Verifying Hashes------------------------------------"
-  sha512sum -c apache-beam-${RELEASE_VER}.tar.gz.sha512
+  sha512sum -c apache_beam-${RELEASE_VER}.tar.gz.sha512
 
   echo "--------------------------Updating ~/.m2/settings.xml-------------------------"
     cd ~
@@ -378,7 +378,7 @@ if [[ ("$python_leaderboard_direct" = true \
     pip install --upgrade pip setuptools wheel
 
     echo "--------------------------Installing Python SDK-------------------------------"
-    pip install apache-beam-${RELEASE_VER}.tar.gz[gcp]
+    pip install apache_beam-${RELEASE_VER}.tar.gz[gcp]
 
     echo "----------------Starting Leaderboard with DirectRunner-----------------------"
     if [[ "$python_leaderboard_direct" = true ]]; then
@@ -434,7 +434,7 @@ if [[ ("$python_leaderboard_direct" = true \
       --dataset ${LEADERBOARD_DF_DATASET} \
       --runner DataflowRunner \
       --temp_location=${USER_GCS_BUCKET}/temp/ \
-      --sdk_location apache-beam-${RELEASE_VER}.tar.gz; \
+      --sdk_location apache_beam-${RELEASE_VER}.tar.gz; \
       exec bash"
 
       echo "***************************************************************"
@@ -509,7 +509,7 @@ if [[ ("$python_leaderboard_direct" = true \
       --dataset ${GAMESTATS_DF_DATASET} \
       --runner DataflowRunner \
       --temp_location=${USER_GCS_BUCKET}/temp/ \
-      --sdk_location apache-beam-${RELEASE_VER}.tar.gz \
+      --sdk_location apache_beam-${RELEASE_VER}.tar.gz \
       --fixed_window_duration ${FIXED_WINDOW_DURATION}; exec bash"
 
       echo "***************************************************************"
@@ -566,14 +566,14 @@ if [[ ("$python_xlang_quickstart" = true) \
   cd ${LOCAL_BEAM_DIR}
 
   echo "---------------------Downloading Python Staging RC----------------------------"
-  wget ${PYTHON_RC_DOWNLOAD_URL}/${RELEASE_VER}/python/apache-beam-${RELEASE_VER}.tar.gz
-  wget ${PYTHON_RC_DOWNLOAD_URL}/${RELEASE_VER}/python/apache-beam-${RELEASE_VER}.tar.gz.sha512
-  if [[ ! -f apache-beam-${RELEASE_VER}.tar.gz ]]; then
+  wget ${PYTHON_RC_DOWNLOAD_URL}/${RELEASE_VER}/python/apache_beam-${RELEASE_VER}.tar.gz
+  wget ${PYTHON_RC_DOWNLOAD_URL}/${RELEASE_VER}/python/apache_beam-${RELEASE_VER}.tar.gz.sha512
+  if [[ ! -f apache_beam-${RELEASE_VER}.tar.gz ]]; then
     { echo "Failed to download Python Staging RC files." ;exit 1; }
   fi
 
   echo "--------------------------Verifying Hashes------------------------------------"
-  sha512sum -c apache-beam-${RELEASE_VER}.tar.gz.sha512
+  sha512sum -c apache_beam-${RELEASE_VER}.tar.gz.sha512
 
   `which pip` install --upgrade pip
   `which pip` install --upgrade setuptools
@@ -593,7 +593,7 @@ if [[ ("$python_xlang_quickstart" = true) \
     ln -s ${LOCAL_BEAM_DIR}/sdks beam_env_${py_version}/lib/sdks
 
     echo "--------------------------Installing Python SDK-------------------------------"
-    pip install apache-beam-${RELEASE_VER}.tar.gz
+    pip install apache_beam-${RELEASE_VER}.tar.gz
 
     echo '************************************************************';
     echo '* Running Python Multi-language Quickstart with DirectRunner';
@@ -672,14 +672,14 @@ if [[ ("$java_xlang_quickstart" = true) \
   cd ${LOCAL_BEAM_DIR}
 
   echo "---------------------Downloading Python Staging RC----------------------------"
-  wget ${PYTHON_RC_DOWNLOAD_URL}/${RELEASE_VER}/python/apache-beam-${RELEASE_VER}.tar.gz
-  wget ${PYTHON_RC_DOWNLOAD_URL}/${RELEASE_VER}/python/apache-beam-${RELEASE_VER}.tar.gz.sha512
-  if [[ ! -f apache-beam-${RELEASE_VER}.tar.gz ]]; then
+  wget ${PYTHON_RC_DOWNLOAD_URL}/${RELEASE_VER}/python/apache_beam-${RELEASE_VER}.tar.gz
+  wget ${PYTHON_RC_DOWNLOAD_URL}/${RELEASE_VER}/python/apache_beam-${RELEASE_VER}.tar.gz.sha512
+  if [[ ! -f apache_beam-${RELEASE_VER}.tar.gz ]]; then
     { echo "Failed to download Python Staging RC files." ;exit 1; }
   fi
 
   echo "--------------------------Verifying Hashes------------------------------------"
-  sha512sum -c apache-beam-${RELEASE_VER}.tar.gz.sha512
+  sha512sum -c apache_beam-${RELEASE_VER}.tar.gz.sha512
 
   `which pip` install --upgrade pip
   `which pip` install --upgrade setuptools
@@ -699,7 +699,7 @@ if [[ ("$java_xlang_quickstart" = true) \
     ln -s ${LOCAL_BEAM_DIR}/sdks beam_env_${py_version}/lib/sdks
 
     echo "--------------------------Installing Python SDK-------------------------------"
-    pip install apache-beam-${RELEASE_VER}.tar.gz[dataframe]
+    pip install apache_beam-${RELEASE_VER}.tar.gz[dataframe]
 
     # Deacrivating in the main shell. We will reactivate the virtual environment new shells
     # for the expansion service and the job server.
@@ -768,14 +768,14 @@ if [[ ("$python_xlang_kafka_taxi_dataflow" = true
   cd ${LOCAL_BEAM_DIR}
 
   echo "---------------------Downloading Python Staging RC----------------------------"
-  wget ${PYTHON_RC_DOWNLOAD_URL}/${RELEASE_VER}/python/apache-beam-${RELEASE_VER}.tar.gz
-  wget ${PYTHON_RC_DOWNLOAD_URL}/${RELEASE_VER}/python/apache-beam-${RELEASE_VER}.tar.gz.sha512
-  if [[ ! -f apache-beam-${RELEASE_VER}.tar.gz ]]; then
+  wget ${PYTHON_RC_DOWNLOAD_URL}/${RELEASE_VER}/python/apache_beam-${RELEASE_VER}.tar.gz
+  wget ${PYTHON_RC_DOWNLOAD_URL}/${RELEASE_VER}/python/apache_beam-${RELEASE_VER}.tar.gz.sha512
+  if [[ ! -f apache_beam-${RELEASE_VER}.tar.gz ]]; then
     { echo "Fail to download Python Staging RC files." ;exit 1; }
   fi
 
   echo "--------------------------Verifying Hashes------------------------------------"
-  sha512sum -c apache-beam-${RELEASE_VER}.tar.gz.sha512
+  sha512sum -c apache_beam-${RELEASE_VER}.tar.gz.sha512
 
   `which pip` install --upgrade pip
   `which pip` install --upgrade setuptools
@@ -807,7 +807,7 @@ if [[ ("$python_xlang_kafka_taxi_dataflow" = true
     ln -s ${LOCAL_BEAM_DIR}/sdks beam_env_${py_version}/lib/sdks
 
     echo "--------------------------Installing Python SDK-------------------------------"
-    pip install apache-beam-${RELEASE_VER}.tar.gz[gcp]
+    pip install apache_beam-${RELEASE_VER}.tar.gz[gcp]
 
     echo "----------------Starting XLang Kafka Taxi with DataflowRunner---------------------"
     if [[ "$python_xlang_kafka_taxi_dataflow" = true ]]; then
@@ -837,7 +837,7 @@ if [[ ("$python_xlang_kafka_taxi_dataflow" = true
       --temp_location=${USER_GCS_BUCKET}/temp/ \
       --with_metadata \
       --beam_services=\"{\\\"sdks:java:io:expansion-service:shadowJar\\\": \\\"${KAFKA_EXPANSION_SERVICE_JAR}\\\"}\" \
-      --sdk_location apache-beam-${RELEASE_VER}.tar.gz; \
+      --sdk_location apache_beam-${RELEASE_VER}.tar.gz; \
       exec bash"
 
       echo "***************************************************************"
@@ -882,7 +882,7 @@ if [[ ("$python_xlang_kafka_taxi_dataflow" = true
       --temp_location=${USER_GCS_BUCKET}/temp/ \
       --output_topic projects/${USER_GCP_PROJECT}/topics/${SQL_TAXI_TOPIC} \
       --beam_services=\"{\\\":sdks:java:extensions:sql:expansion-service:shadowJar\\\": \\\"${SQL_EXPANSION_SERVICE_JAR}\\\"}\" \
-      --sdk_location apache-beam-${RELEASE_VER}.tar.gz; \
+      --sdk_location apache_beam-${RELEASE_VER}.tar.gz; \
       exec bash"
 
       echo "***************************************************************"