Partially revert #35598 (#35600)

damccorm · web-flow · commit e8d4395d081b · 2025-07-15T14:50:11.000-04:00
diff --git a/.github/workflows/beam_PostCommit_Python.yml b/.github/workflows/beam_PostCommit_Python.yml
@@ -54,20 +54,14 @@ env:
 jobs:
   beam_PostCommit_Python:
     name: ${{ matrix.job_name }} (${{ matrix.job_phrase }} ${{ matrix.python_version }})
-    runs-on: ${{ matrix.os }}
+    runs-on: [self-hosted, ubuntu-20.04, highmem22]
     timeout-minutes: 240
     strategy:
       fail-fast: false
       matrix:
         job_name: [beam_PostCommit_Python]
         job_phrase: [Run Python PostCommit]
         python_version: ['3.9', '3.10', '3.11', '3.12']
-        # Run on both self-hosted and GitHub-hosted runners.
-        # Some tests (marked require_docker_in_docker) can't run on Beam's
-        # self-hosted runners due to Docker-in-Docker environment constraint.
-        # These tests will only execute on ubuntu-latest (GitHub-hosted).
-        # Context: https://github.com/apache/beam/pull/35585
-        os: [[self-hosted, ubuntu-20.04, highmem22], [ubuntu-latest]]
     if: |
       github.event_name == 'workflow_dispatch' ||
       github.event_name == 'pull_request_target' ||
@@ -105,11 +99,6 @@ jobs:
           arguments: |
             -Pjava21Home=$JAVA_HOME_21_X64 \
             -PuseWheelDistribution \
-            -Pposargs="${{
-              contains(matrix.os, 'self-hosted') &&
-                '-m ''not require_docker_in_docker''' ||
-                '-m ''require_docker_in_docker'''
-            }}" \
             -PpythonVersion=${{ matrix.python_version }} \
         env:
           CLOUDSDK_CONFIG: ${{ env.KUBELET_GCLOUD_CONFIG_PATH}}
diff --git a/.github/workflows/beam_PreCommit_Python_ML.yml b/.github/workflows/beam_PreCommit_Python_ML.yml
@@ -58,20 +58,14 @@ env:
 jobs:
   beam_PreCommit_Python_ML:
     name: ${{ matrix.job_name }} (${{ matrix.job_phrase }} ${{ matrix.python_version }})
-    runs-on: ${{ matrix.os }}
+    runs-on: [self-hosted, ubuntu-20.04, main]
     timeout-minutes: 180
     strategy:
       fail-fast: false
       matrix:
         job_name: ['beam_PreCommit_Python_ML']
         job_phrase: ['Run Python_ML PreCommit']
         python_version: ['3.9','3.10','3.11','3.12']
-        # Run on both self-hosted and GitHub-hosted runners.
-        # Some tests (marked require_docker_in_docker) can't run on Beam's
-        # self-hosted runners due to Docker-in-Docker environment constraint.
-        # These tests will only execute on ubuntu-latest (GitHub-hosted).
-        # Context: https://github.com/apache/beam/pull/35585
-        os: [[self-hosted, ubuntu-20.04, main], [ubuntu-latest]]
     if: |
       github.event_name == 'push' ||
       github.event_name == 'pull_request_target' ||
@@ -102,11 +96,7 @@ jobs:
         with:
           gradle-command: :sdks:python:test-suites:tox:py${{steps.set_py_ver_clean.outputs.py_ver_clean}}:testPy${{steps.set_py_ver_clean.outputs.py_ver_clean}}ML
           arguments: |
-            -Pposargs="${{
-              contains(matrix.os, 'self-hosted') &&
-                'apache_beam/ml/ -m ''not require_docker_in_docker''' ||
-                'apache_beam/ml/ -m ''require_docker_in_docker'''
-            }}" \
+            -Pposargs=apache_beam/ml/ \
             -PpythonVersion=${{ matrix.python_version }}
       - name: Archive Python Test Results
         uses: actions/upload-artifact@v4
