Skip to content

Commit

Permalink
Remove unused is-slow-ci input from fast and slow integration testi…
Browse files Browse the repository at this point in the history
…ng (#2382)

* update conditional checks

* remove gh actions runners-specific code

* further removal

* docker reload also limited

* formatting

* remove is-slow-ci input
  • Loading branch information
strickvl authored Feb 1, 2024
1 parent a6a39f8 commit f6a088d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 37 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/ci-slow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -193,5 +191,4 @@ jobs:
os: ${{ matrix.os }}
python-version: ${{ matrix.python-version }}
test_environment: ${{ matrix.test_environment }}
is-slow-ci: true
secrets: inherit
21 changes: 5 additions & 16 deletions .github/workflows/integration-test-fast.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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/[email protected]
Expand Down Expand Up @@ -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'
Expand All @@ -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"
Expand Down Expand Up @@ -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
Expand Down
24 changes: 6 additions & 18 deletions .github/workflows/integration-test-slow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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/[email protected]
Expand Down Expand Up @@ -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'
Expand All @@ -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"
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit f6a088d

Please sign in to comment.