apache · tvalentyn · Sep 20, 2023
diff --git a/.github/actions/setup-action/action.yml b/.github/actions/setup-action/action.yml
@@ -70,5 +70,3 @@ runs:
       shell: bash
       run: |
         echo KUBELET_GCLOUD_CONFIG_PATH=/var/lib/kubelet/pods/$POD_UID/volumes/kubernetes.io~empty-dir/gcloud >> $GITHUB_ENV
-    - name: Setup environment
-      uses: ./.github/actions/setup-environment-action
diff --git a/...tions/setup-environment-action/action.yml → ...tions/setup-self-hosted-action/action.yml b/...tions/setup-environment-action/action.yml → ...tions/setup-self-hosted-action/action.yml
@@ -15,42 +15,47 @@
 # specific language governing permissions and limitations
 # under the License.
 
-name: 'Setup environment action'
-description: 'Setup environment to run jobs'
+name: 'Setup environment for self-hosted runners'
+description: 'Setup action to run jobs in a self-hosted runner'
 inputs:
-  python-version:
+  requires-py-38:
     required: false
-    description: 'Install Python version'
-    default: ''
-  java-version:
+    description: 'Set as false if does not require py38 setup'
+    default: 'true'
+  requires-py-39:
     required: false
-    description: 'Install Java version'
-    default: ''
-  go-version:
+    description: 'Set as false if does not require py39 setup'
+    default: 'true'
+  requires-java-8:
     required: false
-    description: 'Install Go version'
-    default: ''
+    description: 'Set as false if does not require java-8 setup'
+    default: 'true'
+  requires-go:
+    required: false
+    description: 'Set as false if does not require go setup'
+    default: 'true'
 
 runs:
   using: "composite"
   steps:
-    - name: Install Python
-      if: ${{ inputs.python-version != '' }}
+    - name: Install python 3.8
+      if: ${{ inputs.requires-py-38 == 'true'  }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.8"
+    - name: Install python 3.9
+      if: ${{ inputs.requires-py-39 == 'true'  }}
       uses: actions/setup-python@v4
       with:
-        python-version: ${{ inputs.python-version }}
-    - name: Install Java
-      if: ${{ inputs.java-version != '' }}
+        python-version: "3.9"
+    - name: Set Java Version
+      if: ${{ inputs.requires-java-8 == 'true'  }}
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: ${{ inputs.java-version }}
-    - name: Setup Gradle
-      uses: gradle/gradle-build-action@v2
-      with:
-        cache-read-only: false
-    - name: Install Go
-      if: ${{ inputs.go-version != '' }}
+        java-version: 8
+    - name: Set Go Version
+      if: ${{ inputs.requires-go == 'true'  }}
       uses: actions/setup-go@v3
       with:
-        go-version: ${{ inputs.go-version }} # never set patch, to get latest patch releases.
+        go-version: '1.21' # never set patch, to get latest patch releases.
diff --git a/.github/workflows/beam_PostCommit_Go_Dataflow_ARM.yml b/.github/workflows/beam_PostCommit_Go_Dataflow_ARM.yml
@@ -73,11 +73,19 @@ jobs:
           comment_phrase: ${{ matrix.job_phrase }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
-      - name: Setup environment
-        uses: ./.github/actions/setup-environment-action
+      - name: Install Java
+        uses: actions/setup-[email protected]
         with:
-          java-version: 8
-          go-version: 1.21
+          distribution: 'zulu'
+          java-version: '8'
+      - name: Install Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: '1.21'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          cache-read-only: false
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       - name: Authenticate on GCP

diff --git a/.github/workflows/beam_PostCommit_Java_Avro_Versions.yml b/.github/workflows/beam_PostCommit_Java_Avro_Versions.yml
@@ -45,11 +45,6 @@ permissions:
   security-events: read
   statuses: read
 
-env:
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
-  GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
-  GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
-
 jobs:
   beam_PostCommit_Java_Avro_Versions:
     name: ${{matrix.job_name}} (${{matrix.job_phrase}})

diff --git a/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_ARM.yml b/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_ARM.yml
@@ -85,10 +85,21 @@ jobs:
           comment_phrase: ${{ matrix.job_phrase }} ${{matrix.java_version}}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }} ${{matrix.java_version}})
-      - name: Setup environment
-        uses: ./.github/actions/setup-environment-action
+      - name: Setup self-hosted
+        uses: ./.github/actions/setup-self-hosted-action
         with:
+          requires-py-38: false
+          requires-py-39: false
+          requires-go: false
+      - name: Set up Java${{ matrix.java_version }}
+        uses: actions/[email protected]
+        with:
+          distribution: 'temurin'
           java-version: ${{ matrix.java_version }}
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          cache-read-only: false
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: Authenticate on GCP

diff --git a/.github/workflows/beam_PostCommit_Java_Examples_Flink.yml b/.github/workflows/beam_PostCommit_Java_Examples_Flink.yml
@@ -71,11 +71,19 @@ jobs:
           comment_phrase: ${{ matrix.job_phrase }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
-      - name: Setup environment
-        uses: ./.github/actions/setup-environment-action
+      - name: Install Java
+        uses: actions/setup-[email protected]
         with:
-          java-version: 8
-          python-version: 3.8
+          distribution: 'zulu'
+          java-version: '8'
+      - name: Install Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.8'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          cache-read-only: false
       - name: run examplesIntegrationTest script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:

diff --git a/.github/workflows/beam_PostCommit_Java_IO_Performance_Tests.yml b/.github/workflows/beam_PostCommit_Java_IO_Performance_Tests.yml
@@ -80,10 +80,15 @@ jobs:
       with:
         ref: v2.50.0 #TODO(https://github.com/apache/beam/issues/28330) automate updating this
         repository: apache/beam
-    - name: Setup environment
-      uses: ./.github/actions/setup-environment-action
+    - name: Install Java
+      uses: actions/setup-[email protected]
       with:
-        java-version: 8
+        distribution: 'zulu'
+        java-version: '8'
+    - name: Setup Gradle
+      uses: gradle/gradle-build-action@v2
+      with:
+        cache-read-only: false
     - name: Authenticate on GCP
       uses: google-github-actions/setup-gcloud@v0
       with:

diff --git a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Flink.yml b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Flink.yml
@@ -69,11 +69,19 @@ jobs:
           comment_phrase: ${{ matrix.job_phrase }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
-      - name: Setup environment
-        uses: ./.github/actions/setup-environment-action
+      - name: Install Java
+        uses: actions/setup-[email protected]
         with:
-          java-version: 8
-          python-version: 3.8
+          distribution: 'zulu'
+          java-version: '8'
+      - name: Install Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.8'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          cache-read-only: false
       - name: run validatesRunner script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:

diff --git a/.github/workflows/beam_PostCommit_Python_Examples_Dataflow.yml b/.github/workflows/beam_PostCommit_Python_Examples_Dataflow.yml
@@ -69,11 +69,19 @@ jobs:
           comment_phrase: ${{ matrix.job_phrase }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
-      - name: Setup environment
-        uses: ./.github/actions/setup-environment-action
+      - name: Install Python
+        uses: actions/setup-python@v4
         with:
-          java-version: 8
           python-version: 3.11
+      - name: Install Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '8'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          cache-read-only: false
       - name: Run examplesPostCommit script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:

diff --git a/.github/workflows/beam_PostCommit_Python_Examples_Direct.yml b/.github/workflows/beam_PostCommit_Python_Examples_Direct.yml
@@ -71,11 +71,19 @@ jobs:
           comment_phrase: ${{ matrix.job_phrase }} ${{ matrix.python_version }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }} ${{ matrix.python_version }})
-      - name: Setup environment
-        uses: ./.github/actions/setup-environment-action
+      - name: Install Python
+        uses: actions/setup-python@v4
         with:
-          java-version: 8
           python-version: ${{ matrix.python_version }}
+      - name: Install Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '8'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          cache-read-only: false
       - name: Set PY_VER_CLEAN
         id: set_py_ver_clean
         run: |

diff --git a/.github/workflows/beam_PostCommit_Python_Examples_Flink.yml b/.github/workflows/beam_PostCommit_Python_Examples_Flink.yml
@@ -71,11 +71,19 @@ jobs:
           comment_phrase: ${{ matrix.job_phrase }} ${{ matrix.python_version }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }} ${{ matrix.python_version }})
-      - name: Setup environment
-        uses: ./.github/actions/setup-environment-action
+      - name: Install Python
+        uses: actions/setup-python@v4
         with:
-          java-version: 8
           python-version: ${{ matrix.python_version }}
+      - name: Install Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '8'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          cache-read-only: false
       - name: Set PY_VER_CLEAN
         id: set_py_ver_clean
         run: |

diff --git a/.github/workflows/beam_PostCommit_Python_Examples_Spark.yml b/.github/workflows/beam_PostCommit_Python_Examples_Spark.yml
@@ -71,11 +71,19 @@ jobs:
           comment_phrase: ${{ matrix.job_phrase }} ${{ matrix.python_version }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }} ${{ matrix.python_version }})
-      - name: Setup environment
-        uses: ./.github/actions/setup-environment-action
+      - name: Install Python
+        uses: actions/setup-python@v4
         with:
-          java-version: 8
           python-version: ${{ matrix.python_version }}
+      - name: Install Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '8'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          cache-read-only: false
       - name: Set PY_VER_CLEAN
         id: set_py_ver_clean
         run: |

diff --git a/.github/workflows/beam_PostCommit_Python_MongoDBIO_IT.yml b/.github/workflows/beam_PostCommit_Python_MongoDBIO_IT.yml
@@ -69,11 +69,19 @@ jobs:
           comment_phrase: ${{ matrix.job_phrase }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
-      - name: Setup environment
-        uses: ./.github/actions/setup-environment-action
+      - name: Install Python
+        uses: actions/setup-python@v4
         with:
-          java-version: 8
           python-version: 3.11
+      - name: Install Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '8'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          cache-read-only: false
       - name: Run mongodbioIT script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:

diff --git a/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow.yml b/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow.yml
@@ -71,11 +71,19 @@ jobs:
           comment_phrase: ${{ matrix.job_phrase }} ${{ matrix.python_version }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }} ${{ matrix.python_version }})
-      - name: Setup environment
-        uses: ./.github/actions/setup-environment-action
+      - name: Install Python
+        uses: actions/setup-python@v4
         with:
-          java-version: 8
           python-version: ${{ matrix.python_version }}
+      - name: Install Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '8'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          cache-read-only: false
       - name: Set PY_VER_CLEAN
         id: set_py_ver_clean
         run: |

diff --git a/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow_With_RC.yml b/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow_With_RC.yml
@@ -71,11 +71,19 @@ jobs:
           comment_phrase: ${{ matrix.job_phrase }} ${{ matrix.python_version }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }} ${{ matrix.python_version }})
-      - name: Setup environment
-        uses: ./.github/actions/setup-environment-action
+      - name: Install Python
+        uses: actions/setup-python@v4
         with:
-          java-version: 8
           python-version: ${{ matrix.python_version }}
+      - name: Install Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '8'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          cache-read-only: false
       - name: Set PY_VER_CLEAN
         id: set_py_ver_clean
         run: |
@@ -89,7 +97,7 @@ jobs:
         with:
           gradle-command: :sdks:python:test-suites:dataflow:py${{steps.set_py_ver_clean.outputs.py_ver_clean}}:validatesContainer
           arguments: |
-            -PtestRCDependencies=true
+            -PtestRCDependencies=true \
             -PpythonVersion=${{ matrix.python_version }} \
       - name: Archive code coverage results
         uses: actions/upload-artifact@v3

diff --git a/.github/workflows/beam_PostCommit_Python_ValidatesRunner_Dataflow.yml b/.github/workflows/beam_PostCommit_Python_ValidatesRunner_Dataflow.yml
@@ -71,11 +71,19 @@ jobs:
           comment_phrase: ${{ matrix.job_phrase }} ${{ matrix.python_version }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }} ${{ matrix.python_version }})
-      - name: Setup environment
-        uses: ./.github/actions/setup-environment-action
+      - name: Install Python
+        uses: actions/setup-python@v4
         with:
-          java-version: 8
           python-version: ${{ matrix.python_version }}
+      - name: Install Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '8'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          cache-read-only: false
       - name: Set PY_VER_CLEAN
         id: set_py_ver_clean
         run: |