This is an automated email from the ASF dual-hosted git repository. vterentev pushed a commit to branch cp-37927 in repository https://gitbox.apache.org/repos/asf/beam.git
commit cf88d3f288e568afc3332d2961aeb61fa69a4c4b Author: Vitaly Terentyev <[email protected]> AuthorDate: Tue Mar 24 19:41:42 2026 +0400 Cherrypick #37927 --- .github/workflows/beam_CleanUpGCPResources.yml | 6 +++--- .github/workflows/beam_Infrastructure_PolicyEnforcer.yml | 10 +++++----- .github/workflows/beam_Infrastructure_SecurityLogging.yml | 4 ++-- .github/workflows/beam_Infrastructure_ServiceAccountKeys.yml | 4 ++-- .github/workflows/beam_Infrastructure_UsersPermissions.yml | 2 +- .github/workflows/beam_Playground_Precommit.yml | 2 +- .github/workflows/beam_PostCommit_Python_Arm.yml | 6 +++--- .../beam_PostCommit_Python_ValidatesContainer_Dataflow.yml | 4 ++-- ...m_PostCommit_Python_ValidatesContainer_Dataflow_With_RC.yml | 6 +++--- .github/workflows/beam_PostCommit_Yaml_Xlang_Direct.yml | 2 +- .github/workflows/beam_PreCommit_Website_Stage_GCS.yml | 2 +- .github/workflows/beam_Publish_Beam_SDK_Snapshots.yml | 6 +++--- .github/workflows/beam_Publish_Website.yml | 2 +- .../workflows/beam_Python_ValidatesContainer_Dataflow_ARM.yml | 6 +++--- .github/workflows/refresh_looker_metrics.yml | 4 ++-- .github/workflows/republish_released_docker_containers.yml | 6 +++--- .github/workflows/run_rc_validation_python_mobile_gaming.yml | 2 +- .github/workflows/run_rc_validation_python_yaml.yml | 2 +- 18 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/beam_CleanUpGCPResources.yml b/.github/workflows/beam_CleanUpGCPResources.yml index 84c44451bae..85856896216 100644 --- a/.github/workflows/beam_CleanUpGCPResources.yml +++ b/.github/workflows/beam_CleanUpGCPResources.yml @@ -54,7 +54,7 @@ jobs: runs-on: [self-hosted, ubuntu-20.04, main] timeout-minutes: 100 strategy: - matrix: + matrix: job_name: [beam_CleanUpGCPResources] job_phrase: [Run Clean GCP Resources] if: | @@ -74,10 +74,10 @@ jobs: with: disable-cache: true - name: Setup gcloud - uses: google-github-actions/setup-gcloud@v3 + uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db - name: Install gcloud bigtable cli run: gcloud components install cbt - name: run cleanup GCP resources uses: ./.github/actions/gradle-command-self-hosted-action with: - gradle-command: :beam-test-tools:cleanupOtherStaleResources \ No newline at end of file + gradle-command: :beam-test-tools:cleanupOtherStaleResources diff --git a/.github/workflows/beam_Infrastructure_PolicyEnforcer.yml b/.github/workflows/beam_Infrastructure_PolicyEnforcer.yml index 82ab2c0fb60..aa56838e507 100644 --- a/.github/workflows/beam_Infrastructure_PolicyEnforcer.yml +++ b/.github/workflows/beam_Infrastructure_PolicyEnforcer.yml @@ -43,21 +43,21 @@ jobs: timeout-minutes: 30 steps: - uses: actions/checkout@v4 - + - name: Setup Python uses: actions/setup-python@v4 with: python-version: '3.13' - + - name: Install Python dependencies working-directory: ./infra/enforcement run: | python -m pip install --upgrade pip pip install -r requirements.txt - + - name: Setup gcloud - uses: google-github-actions/setup-gcloud@v3 - + uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db + - name: Run IAM Policy Enforcement working-directory: ./infra/enforcement env: diff --git a/.github/workflows/beam_Infrastructure_SecurityLogging.yml b/.github/workflows/beam_Infrastructure_SecurityLogging.yml index 106e0cf6d54..818341d036b 100644 --- a/.github/workflows/beam_Infrastructure_SecurityLogging.yml +++ b/.github/workflows/beam_Infrastructure_SecurityLogging.yml @@ -56,9 +56,9 @@ jobs: run: | python -m pip install --upgrade pip pip install -r requirements.txt - + - name: Setup gcloud - uses: google-github-actions/setup-gcloud@v3 + uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db - name: Initialize Log Sinks if: github.event_name == 'push' || github.event_name == 'workflow_dispatch' diff --git a/.github/workflows/beam_Infrastructure_ServiceAccountKeys.yml b/.github/workflows/beam_Infrastructure_ServiceAccountKeys.yml index d84f41d158b..f64ce14c559 100644 --- a/.github/workflows/beam_Infrastructure_ServiceAccountKeys.yml +++ b/.github/workflows/beam_Infrastructure_ServiceAccountKeys.yml @@ -50,7 +50,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Setup gcloud - uses: google-github-actions/setup-gcloud@v3 + uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db - name: Setup Python uses: actions/setup-python@v4 @@ -62,7 +62,7 @@ jobs: run: | python -m pip install --upgrade pip pip install -r requirements.txt - + - name: Run Service Account Key Management working-directory: ./infra/keys run: python keys.py --cron-dry-run diff --git a/.github/workflows/beam_Infrastructure_UsersPermissions.yml b/.github/workflows/beam_Infrastructure_UsersPermissions.yml index 04596b756ac..765ddd1a05b 100644 --- a/.github/workflows/beam_Infrastructure_UsersPermissions.yml +++ b/.github/workflows/beam_Infrastructure_UsersPermissions.yml @@ -49,7 +49,7 @@ jobs: with: ref: ${{ github.event.pull_request.merged == true && github.base_ref || github.event.pull_request.head.sha }} - name: Setup gcloud - uses: google-github-actions/setup-gcloud@v3 + uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db - name: Install Terraform uses: hashicorp/setup-terraform@v3 with: diff --git a/.github/workflows/beam_Playground_Precommit.yml b/.github/workflows/beam_Playground_Precommit.yml index 2e780ed3310..f3eaaaf1322 100644 --- a/.github/workflows/beam_Playground_Precommit.yml +++ b/.github/workflows/beam_Playground_Precommit.yml @@ -75,7 +75,7 @@ jobs: sudo apt-get install sbt --yes sudo wget https://codeload.github.com/spotify/scio.g8/zip/7c1ba7c1651dfd70976028842e721da4107c0d6d -O scio.g8.zip && unzip scio.g8.zip && sudo mv scio.g8-7c1ba7c1651dfd70976028842e721da4107c0d6d /opt/scio.g8 - name: Set up Cloud SDK and its components - uses: google-github-actions/setup-gcloud@v3 + uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db with: install_components: 'beta,cloud-datastore-emulator' version: '${{ env.DATASTORE_EMULATOR_VERSION }}' diff --git a/.github/workflows/beam_PostCommit_Python_Arm.yml b/.github/workflows/beam_PostCommit_Python_Arm.yml index d387e3d2d46..e490fce6b8a 100644 --- a/.github/workflows/beam_PostCommit_Python_Arm.yml +++ b/.github/workflows/beam_PostCommit_Python_Arm.yml @@ -84,14 +84,14 @@ jobs: sudo curl -L https://github.com/docker/compose/releases/download/1.22.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose sudo chmod +x /usr/local/bin/docker-compose - name: Authenticate on GCP - uses: google-github-actions/auth@v3 + uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 with: service_account: ${{ secrets.GCP_SA_EMAIL }} credentials_json: ${{ secrets.GCP_SA_KEY }} - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@v3 + uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd - name: GCloud Docker credential helper run: | gcloud auth configure-docker us.gcr.io diff --git a/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow.yml b/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow.yml index 5358b4e07b4..da4f8e92334 100644 --- a/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow.yml +++ b/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow.yml @@ -80,12 +80,12 @@ jobs: java-version: default python-version: ${{ matrix.python_version }} - name: Authenticate to GCP - uses: google-github-actions/auth@v3 + uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 with: service_account: ${{ secrets.GCP_SA_EMAIL }} credentials_json: ${{ secrets.GCP_SA_KEY }} - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@v3 + uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db - name: Configure Docker auth for GCR run: | gcloud --quiet auth configure-docker us.gcr.io diff --git a/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow_With_RC.yml b/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow_With_RC.yml index fc4287dac92..47e6a69ad57 100644 --- a/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow_With_RC.yml +++ b/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow_With_RC.yml @@ -82,12 +82,12 @@ jobs: java-version: default python-version: ${{ matrix.python_version }} - name: Authenticate to GCP - uses: google-github-actions/auth@v3 + uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 with: service_account: ${{ secrets.GCP_SA_EMAIL }} credentials_json: ${{ secrets.GCP_SA_KEY }} - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@v3 + uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db - name: Set PY_VER_CLEAN id: set_py_ver_clean run: | @@ -125,4 +125,4 @@ jobs: commit: '${{ env.prsha || env.GITHUB_SHA }}' comment_mode: ${{ github.event_name == 'issue_comment' && 'always' || 'off' }} files: '**/pytest*.xml' - large_files: true \ No newline at end of file + large_files: true diff --git a/.github/workflows/beam_PostCommit_Yaml_Xlang_Direct.yml b/.github/workflows/beam_PostCommit_Yaml_Xlang_Direct.yml index 7cadff17f07..9e5295b1ca1 100644 --- a/.github/workflows/beam_PostCommit_Yaml_Xlang_Direct.yml +++ b/.github/workflows/beam_PostCommit_Yaml_Xlang_Direct.yml @@ -76,7 +76,7 @@ jobs: python-version: default java-version: '11' - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@v3 + uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db - name: run PostCommit Yaml Xlang Direct script uses: ./.github/actions/gradle-command-self-hosted-action with: diff --git a/.github/workflows/beam_PreCommit_Website_Stage_GCS.yml b/.github/workflows/beam_PreCommit_Website_Stage_GCS.yml index 203d27a6c22..0d229ce2e04 100644 --- a/.github/workflows/beam_PreCommit_Website_Stage_GCS.yml +++ b/.github/workflows/beam_PreCommit_Website_Stage_GCS.yml @@ -89,7 +89,7 @@ jobs: java-version: default - name: Authenticate on GCP id: auth-gcp - uses: google-github-actions/auth@v3 + uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 with: service_account: ${{ secrets.GCP_SA_EMAIL }} credentials_json: ${{ secrets.GCP_SA_KEY }} diff --git a/.github/workflows/beam_Publish_Beam_SDK_Snapshots.yml b/.github/workflows/beam_Publish_Beam_SDK_Snapshots.yml index 0cfd35237fc..0eda54beb02 100644 --- a/.github/workflows/beam_Publish_Beam_SDK_Snapshots.yml +++ b/.github/workflows/beam_Publish_Beam_SDK_Snapshots.yml @@ -97,14 +97,14 @@ jobs: if: github.ref == 'refs/heads/master' run: echo "LATEST_TAG=,latest" >> $GITHUB_ENV - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd - name: Authenticate on GCP - uses: google-github-actions/auth@v3 + uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 with: service_account: ${{ secrets.GCP_SA_EMAIL }} credentials_json: ${{ secrets.GCP_SA_KEY }} - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@v3 + uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db - name: GCloud Docker credential helper run: | gcloud auth configure-docker ${{ env.docker_registry }} diff --git a/.github/workflows/beam_Publish_Website.yml b/.github/workflows/beam_Publish_Website.yml index c20313b7b04..925776c2195 100644 --- a/.github/workflows/beam_Publish_Website.yml +++ b/.github/workflows/beam_Publish_Website.yml @@ -60,7 +60,7 @@ jobs: disable-cache: true - name: Authenticate on GCP id: auth-gcp - uses: google-github-actions/auth@v3 + uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 with: service_account: ${{ secrets.GCP_SA_EMAIL }} credentials_json: ${{ secrets.GCP_SA_KEY }} diff --git a/.github/workflows/beam_Python_ValidatesContainer_Dataflow_ARM.yml b/.github/workflows/beam_Python_ValidatesContainer_Dataflow_ARM.yml index d0cccde4aa3..8316026822d 100644 --- a/.github/workflows/beam_Python_ValidatesContainer_Dataflow_ARM.yml +++ b/.github/workflows/beam_Python_ValidatesContainer_Dataflow_ARM.yml @@ -77,14 +77,14 @@ jobs: with: python-version: ${{ matrix.python_version }} - name: Authenticate on GCP - uses: google-github-actions/auth@v3 + uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 with: service_account: ${{ secrets.GCP_SA_EMAIL }} credentials_json: ${{ secrets.GCP_SA_KEY }} - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@v3 + uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd - name: GCloud Docker credential helper run: | gcloud auth configure-docker us.gcr.io diff --git a/.github/workflows/refresh_looker_metrics.yml b/.github/workflows/refresh_looker_metrics.yml index 5cb5d0514b3..1188828a96a 100644 --- a/.github/workflows/refresh_looker_metrics.yml +++ b/.github/workflows/refresh_looker_metrics.yml @@ -37,10 +37,10 @@ jobs: python-version: 3.11 - run: pip install requests google-cloud-storage looker-sdk - name: Authenticate on GCP - uses: google-github-actions/auth@v3 + uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 with: service_account: ${{ secrets.GCP_SA_EMAIL }} credentials_json: ${{ secrets.GCP_SA_KEY }} - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@v3 + uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db - run: python .test-infra/tools/refresh_looker_metrics.py diff --git a/.github/workflows/republish_released_docker_containers.yml b/.github/workflows/republish_released_docker_containers.yml index a35b1e0b3b3..294cf1b0bf7 100644 --- a/.github/workflows/republish_released_docker_containers.yml +++ b/.github/workflows/republish_released_docker_containers.yml @@ -72,14 +72,14 @@ jobs: with: python-version: '3.10' - name: Authenticate on GCP - uses: google-github-actions/auth@v3 + uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 with: service_account: ${{ secrets.GCP_SA_EMAIL }} credentials_json: ${{ secrets.GCP_SA_KEY }} - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@v3 + uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd - name: Remove default github maven configuration # This step is a workaround to avoid a decryption issue of Beam's # net.linguica.gradle.maven.settings plugin and github's provided maven diff --git a/.github/workflows/run_rc_validation_python_mobile_gaming.yml b/.github/workflows/run_rc_validation_python_mobile_gaming.yml index 27118a13926..d42e6e680c4 100644 --- a/.github/workflows/run_rc_validation_python_mobile_gaming.yml +++ b/.github/workflows/run_rc_validation_python_mobile_gaming.yml @@ -115,7 +115,7 @@ jobs: shell: bash - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@v3 + uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db - name: Download RC Artifacts run: | diff --git a/.github/workflows/run_rc_validation_python_yaml.yml b/.github/workflows/run_rc_validation_python_yaml.yml index 00a67ddd59a..02c7289d78b 100644 --- a/.github/workflows/run_rc_validation_python_yaml.yml +++ b/.github/workflows/run_rc_validation_python_yaml.yml @@ -102,7 +102,7 @@ jobs: shell: bash - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@v3 + uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db - name: Download RC Artifacts run: |
