This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch cleanup-runs-on-in-workflows in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 7e937118dc26d029edf4b268d33eddd056a699b2 Author: Jarek Potiuk <[email protected]> AuthorDate: Mon Mar 25 16:49:52 2024 +0100 Cleans up runs-on in workflows The RUNS_ON has been used in the past as env variable in the workflows but it's not used any more. Also several of the runs-om directive are using passed `runs-on` but they are small/fast jobs that can be easily run on small, public runners, so this PR revieved and updated all those places. --- .github/workflows/additional-ci-image-checks.yml | 2 +- .github/workflows/build-images.yml | 2 +- .github/workflows/check-providers.yml | 3 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/helm-tests.yml | 4 +--- .github/workflows/integration-tests.yml | 1 - .github/workflows/k8s-tests.yml | 1 - .github/workflows/release_dockerhub_image.yml | 2 -- .github/workflows/run-unit-tests.yml | 1 - 9 files changed, 5 insertions(+), 15 deletions(-) diff --git a/.github/workflows/additional-ci-image-checks.yml b/.github/workflows/additional-ci-image-checks.yml index 6de5862aef..f73fe08ec7 100644 --- a/.github/workflows/additional-ci-image-checks.yml +++ b/.github/workflows/additional-ci-image-checks.yml @@ -169,7 +169,7 @@ jobs: test-airflow-release-commands: timeout-minutes: 80 name: "Test Airflow release commands" - runs-on: ${{ fromJSON(inputs.runs-on) }} + runs-on: ["ubuntu-22.0.4"] env: PYTHON_MAJOR_MINOR_VERSION: "${{ inputs.default-python-version }}" IMAGE_TAG: ${{ inputs.image-tag }} diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml index 6897e2c07c..bc8c35e6b1 100644 --- a/.github/workflows/build-images.yml +++ b/.github/workflows/build-images.yml @@ -51,7 +51,7 @@ jobs: build-info: timeout-minutes: 10 name: "Build Info" - runs-on: ['ubuntu-22.04'] + runs-on: ["ubuntu-22.04"] env: TARGET_BRANCH: ${{ github.event.pull_request.base.ref }} outputs: diff --git a/.github/workflows/check-providers.yml b/.github/workflows/check-providers.yml index 04f140b536..b2d2c8804e 100644 --- a/.github/workflows/check-providers.yml +++ b/.github/workflows/check-providers.yml @@ -61,7 +61,6 @@ jobs: name: "Provider packages wheel build and verify" runs-on: ${{fromJSON(inputs.runs-on)}} env: - RUNS_ON: "${{ inputs.runs-on }}" PYTHON_MAJOR_MINOR_VERSION: "${{ inputs.default-python-version }}" IMAGE_TAG: "${{ inputs.image-tag }}" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -127,7 +126,6 @@ jobs: name: "Provider packages sdist build and install" runs-on: ${{fromJSON(inputs.runs-on)}} env: - RUNS_ON: "${{ inputs.runs-on }}" PYTHON_MAJOR_MINOR_VERSION: "${{ inputs.default-python-version }}" IMAGE_TAG: "${{ inputs.image-tag }}" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -196,7 +194,6 @@ jobs: matrix: include: ${{fromJson(inputs.providers-compatibility-checks)}} env: - RUNS_ON: "${{ inputs.runs-on }}" IMAGE_TAG: "${{ inputs.image-tag }}" PYTHON_MAJOR_MINOR_VERSION: "${{matrix.python-version}}" VERSION_SUFFIX_FOR_PYPI: "dev0" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a869a160f..547544b93a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -248,7 +248,7 @@ jobs: needs: [build-info, wait-for-ci-images] uses: ./.github/workflows/additional-ci-image-checks.yml with: - runs-on: ${{needs.build-info.outputs.runs-on}} + runs-on: ${{ needs.build-info.outputs.runs-on }} image-tag: ${{ needs.build-info.outputs.image-tag }} python-versions: ${{ needs.build-info.outputs.python-versions }} branch: ${{ needs.build-info.outputs.default-branch }} @@ -269,7 +269,7 @@ jobs: needs: [build-info, wait-for-ci-images] uses: ./.github/workflows/static-checks-mypy-and-constraints-generation.yml with: - runs-on: ${{needs.build-info.outputs.runs-on}} + runs-on: ${{ needs.build-info.outputs.runs-on }} image-tag: ${{ needs.build-info.outputs.image-tag }} python-versions-list-as-string: ${{ needs.build-info.outputs.python-versions-list-as-string }} branch: ${{ needs.build-info.outputs.default-branch }} diff --git a/.github/workflows/helm-tests.yml b/.github/workflows/helm-tests.yml index eddc233ff6..a729d391b5 100644 --- a/.github/workflows/helm-tests.yml +++ b/.github/workflows/helm-tests.yml @@ -47,7 +47,6 @@ jobs: matrix: helm-test-package: ${{ fromJson(inputs.helm-test-packages) }} env: - RUNS_ON: "${{ inputs.runs-on }}" # Always use default Python version of CI image for preparing packages PYTHON_MAJOR_MINOR_VERSION: "${{ inputs.default-python-version }}" PARALLEL_TEST_TYPES: "Helm" @@ -75,9 +74,8 @@ jobs: tests-helm-release: timeout-minutes: 80 name: "Release Helm" - runs-on: ${{ fromJSON(inputs.runs-on) }} + runs-on: ["ubuntu-22.04"] env: - RUNS_ON: "${{inputs.runs-on}}" PYTHON_MAJOR_MINOR_VERSION: "${{inputs.default-python-version}}" steps: - name: "Cleanup repo" diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 5d6c92bbbf..5685708d97 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -75,7 +75,6 @@ jobs: - backend: mysql backend-version: ${{ inputs.default-mysql-version }} env: - RUNS_ON: "${{ inputs.runs-on }}" IMAGE_TAG: "${{ inputs.image-tag }}" PARALLEL_TEST_TYPES: "${{ inputs.parallel-test-types-list-as-string }}" BACKEND: "${{ matrix.backend }}" diff --git a/.github/workflows/k8s-tests.yml b/.github/workflows/k8s-tests.yml index de9f5424da..1482dd050d 100644 --- a/.github/workflows/k8s-tests.yml +++ b/.github/workflows/k8s-tests.yml @@ -62,7 +62,6 @@ jobs: use-standard-naming: [true, false] fail-fast: false env: - RUNS_ON: ${{ inputs.outputs.runs-on }} DEBUG_RESOURCES: ${{ inputs.debug-resources }} INCLUDE_SUCCESS_OUTPUTS: ${{ inputs.include-success-outputs }} IMAGE_TAG: ${{ inputs.image-tag }} diff --git a/.github/workflows/release_dockerhub_image.yml b/.github/workflows/release_dockerhub_image.yml index 833617432e..50c81d38a0 100644 --- a/.github/workflows/release_dockerhub_image.yml +++ b/.github/workflows/release_dockerhub_image.yml @@ -81,8 +81,6 @@ jobs: fail-fast: false matrix: python-version: ${{ fromJson(needs.build-info.outputs.pythonVersions) }} - env: - RUNS_ON: '["self-hosted", "Linux", "X64"]' if: contains(fromJSON('[ "ashb", "eladkal", diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index ef7f86b481..88fc8b612e 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -136,7 +136,6 @@ jobs: PARALLEL_TEST_TYPES: "${{ inputs.parallel-test-types-list-as-string }}" PYDANTIC: "${{ inputs.pydantic }}" PYTHON_MAJOR_MINOR_VERSION: "${{ matrix.python-version }}" - RUNS_ON: "${{inputs.runs-on}}" UPGRADE_BOTO: "${{ inputs.upgrade-boto }}" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps:
