From f6a088df8980ca0db627f94e3d9cbc113ef37735 Mon Sep 17 00:00:00 2001 From: Alex Strick van Linschoten Date: Thu, 1 Feb 2024 14:28:02 +0100 Subject: [PATCH] Remove unused `is-slow-ci` input from fast and slow integration testing (#2382) * update conditional checks * remove gh actions runners-specific code * further removal * docker reload also limited * formatting * remove is-slow-ci input --- .github/workflows/ci-slow.yml | 3 --- .github/workflows/integration-test-fast.yml | 21 +++++------------- .github/workflows/integration-test-slow.yml | 24 ++++++--------------- 3 files changed, 11 insertions(+), 37 deletions(-) diff --git a/.github/workflows/ci-slow.yml b/.github/workflows/ci-slow.yml index b48a214e0d2..a7f0c922fd4 100644 --- a/.github/workflows/ci-slow.yml +++ b/.github/workflows/ci-slow.yml @@ -146,7 +146,6 @@ jobs: os: ${{ matrix.os }} python-version: ${{ matrix.python-version }} test_environment: ${{ matrix.test_environment }} - is-slow-ci: true secrets: inherit macos-integration-test: needs: run-slow-ci-label-is-set @@ -161,7 +160,6 @@ jobs: os: ${{ matrix.os }} python-version: ${{ matrix.python-version }} test_environment: ${{ matrix.test_environment }} - is-slow-ci: true secrets: inherit custom-ubuntu-integration-test: needs: run-slow-ci-label-is-set @@ -193,5 +191,4 @@ jobs: os: ${{ matrix.os }} python-version: ${{ matrix.python-version }} test_environment: ${{ matrix.test_environment }} - is-slow-ci: true secrets: inherit diff --git a/.github/workflows/integration-test-fast.yml b/.github/workflows/integration-test-fast.yml index 309160d8f32..5c252ce853a 100644 --- a/.github/workflows/integration-test-fast.yml +++ b/.github/workflows/integration-test-fast.yml @@ -11,11 +11,6 @@ on: description: Python version type: string required: true - is-slow-ci: - description: Whether we're using the slow CI - type: boolean - required: false - default: false test_environment: description: The test environment type: string @@ -48,11 +43,6 @@ on: options: ['3.8', '3.9', '3.10', '3.11'] required: false default: '3.8' - is-slow-ci: - description: Whether we're using the slow CI - type: boolean - required: false - default: false test_environment: description: The test environment type: choice @@ -123,12 +113,12 @@ jobs: remove-android: 'true' remove-haskell: 'true' build-mount-path: /var/lib/docker/ - if: inputs.os=='ubuntu-latest' && (contains(inputs.test_environment, 'docker') + if: inputs.os == 'ubuntu-latest' && (contains(inputs.test_environment, 'docker') || contains(inputs.test_environment, 'kubeflow') || contains(inputs.test_environment, 'airflow') || contains(inputs.test_environment, 'kubernetes')) - name: Reload Docker run: sudo systemctl restart docker - if: inputs.os=='ubuntu-latest' && (contains(inputs.test_environment, 'docker') + if: inputs.os == 'ubuntu-latest' && (contains(inputs.test_environment, 'docker') || contains(inputs.test_environment, 'kubeflow') || contains(inputs.test_environment, 'airflow') || contains(inputs.test_environment, 'kubernetes')) - uses: actions/checkout@v4.1.1 @@ -162,7 +152,7 @@ jobs: pip install pyyaml==5.3.1 pip install docker-compose - name: Install Linux System Dependencies - if: inputs.os=='ubuntu-latest' + if: (inputs.os == 'ubuntu-latest' || inputs.os == 'ubuntu-dind-runners') run: sudo apt install graphviz - name: Install MacOS System Dependencies if: runner.os=='macOS' @@ -189,7 +179,7 @@ jobs: run: | curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" sudo install -o root -g 0 -m 0755 kubectl /usr/local/bin/kubectl - if: inputs.os=='ubuntu-latest' + if: (inputs.os == 'ubuntu-latest' || inputs.os == 'ubuntu-dind-runners') - name: Install kubectl on MacOS run: | curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/darwin/amd64/kubectl" @@ -226,8 +216,7 @@ jobs: timeout-minutes: ${{ inputs.tmate_timeout }} - name: Sharded Integration Tests (Ubuntu) - Fast CI # Ubuntu integration tests run as 6 shards - if: runner.os != 'macOS' && runner.os != 'Windows' && inputs.is-slow-ci == - 'false' + if: runner.os != 'macOS' && runner.os != 'Windows' run: | bash scripts/test-coverage-xml.sh integration ${{ inputs.test_environment }} 6 ${{ matrix.shard }} - name: Setup tmate session after tests diff --git a/.github/workflows/integration-test-slow.yml b/.github/workflows/integration-test-slow.yml index e1a1f951a7f..8d73516f4df 100644 --- a/.github/workflows/integration-test-slow.yml +++ b/.github/workflows/integration-test-slow.yml @@ -11,11 +11,6 @@ on: description: Python version type: string required: true - is-slow-ci: - description: Whether we're using the slow CI - type: boolean - required: false - default: false test_environment: description: The test environment type: string @@ -48,11 +43,6 @@ on: options: ['3.8', '3.9', '3.10', '3.11'] required: false default: '3.8' - is-slow-ci: - description: Whether we're using the slow CI - type: boolean - required: false - default: false test_environment: description: The test environment type: choice @@ -121,12 +111,12 @@ jobs: remove-android: 'true' remove-haskell: 'true' build-mount-path: /var/lib/docker/ - if: inputs.os=='ubuntu-latest' && (contains(inputs.test_environment, 'docker') + if: inputs.os == 'ubuntu-latest' && (contains(inputs.test_environment, 'docker') || contains(inputs.test_environment, 'kubeflow') || contains(inputs.test_environment, 'airflow') || contains(inputs.test_environment, 'kubernetes')) - name: Reload Docker run: sudo systemctl restart docker - if: inputs.os=='ubuntu-latest' && (contains(inputs.test_environment, 'docker') + if: inputs.os == 'ubuntu-latest' && (contains(inputs.test_environment, 'docker') || contains(inputs.test_environment, 'kubeflow') || contains(inputs.test_environment, 'airflow') || contains(inputs.test_environment, 'kubernetes')) - uses: actions/checkout@v4.1.1 @@ -160,7 +150,7 @@ jobs: pip install pyyaml==5.3.1 pip install docker-compose - name: Install Linux System Dependencies - if: inputs.os=='ubuntu-latest' + if: (inputs.os == 'ubuntu-latest' || inputs.os == 'ubuntu-dind-runners') run: sudo apt install graphviz - name: Install MacOS System Dependencies if: runner.os=='macOS' @@ -187,7 +177,7 @@ jobs: run: | curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" sudo install -o root -g 0 -m 0755 kubectl /usr/local/bin/kubectl - if: inputs.os=='ubuntu-latest' + if: (inputs.os == 'ubuntu-latest' || inputs.os == 'ubuntu-dind-runners') - name: Install kubectl on MacOS run: | curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/darwin/amd64/kubectl" @@ -224,13 +214,11 @@ jobs: timeout-minutes: ${{ inputs.tmate_timeout }} - name: Integration Tests (Ubuntu) - Slow CI # Ubuntu Slow CI integration tests run on single machines - if: runner.os != 'macOS' && runner.os != 'Windows' && inputs.is-slow-ci == - 'true' + if: runner.os != 'macOS' && runner.os != 'Windows' run: | bash scripts/test-coverage-xml.sh integration ${{ inputs.test_environment }} - name: Integration Tests (Non-Ubuntu) - Slow CI - if: runner.os == 'macOS' || runner.os == 'Windows' && inputs.is-slow-ci == - 'true' + if: runner.os == 'macOS' || runner.os == 'Windows' run: | bash scripts/test-coverage-xml.sh integration ${{ inputs.test_environment }} - name: Setup tmate session after tests