From 36788a7acc6759edad20a305bdf49324ae237133 Mon Sep 17 00:00:00 2001 From: Alexei Dodon Date: Thu, 26 Oct 2023 18:16:25 +0300 Subject: [PATCH] ci: resource tuning for faster runs Signed-off-by: Alexei Dodon --- .github/workflows/benchmark.yaml | 2 +- .github/workflows/branch-cov.yaml | 2 +- .github/workflows/cluster.yaml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/ecosystem-tools.yaml | 4 +--- .github/workflows/gc-stress-test.yaml | 8 ++++---- .github/workflows/nightly.yaml | 6 +++--- .github/workflows/test.yaml | 8 -------- 8 files changed, 12 insertions(+), 22 deletions(-) diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml index c4a0226ef5..ec8dde6cae 100644 --- a/.github/workflows/benchmark.yaml +++ b/.github/workflows/benchmark.yaml @@ -12,7 +12,7 @@ permissions: read-all jobs: benchmark: name: Performance regression check - runs-on: ubuntu-latest + runs-on: ubuntu-latest-4-cores steps: - uses: actions/checkout@v4 - uses: actions/setup-go@v4 diff --git a/.github/workflows/branch-cov.yaml b/.github/workflows/branch-cov.yaml index ccd44b5153..569b902989 100644 --- a/.github/workflows/branch-cov.yaml +++ b/.github/workflows/branch-cov.yaml @@ -11,7 +11,7 @@ permissions: read-all jobs: branch-cov: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-4-cores name: coverage steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/cluster.yaml b/.github/workflows/cluster.yaml index 22c5266dc1..3a15389e3c 100644 --- a/.github/workflows/cluster.yaml +++ b/.github/workflows/cluster.yaml @@ -14,7 +14,7 @@ permissions: read-all jobs: client-tools: name: Stateless zot with shared reliable storage - runs-on: ubuntu-latest + runs-on: ubuntu-latest-4-cores # services: # minio: # image: minio/minio:edge-cicd diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 0ff04be909..3ccfbe9a99 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -25,7 +25,7 @@ permissions: read-all jobs: analyze: name: Analyze - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest-4-cores permissions: actions: read contents: read diff --git a/.github/workflows/ecosystem-tools.yaml b/.github/workflows/ecosystem-tools.yaml index c27183a52c..99ae7450df 100644 --- a/.github/workflows/ecosystem-tools.yaml +++ b/.github/workflows/ecosystem-tools.yaml @@ -14,7 +14,7 @@ permissions: read-all jobs: client-tools: name: Check client tools - runs-on: ubuntu-latest + runs-on: ubuntu-latest-4-cores steps: - uses: actions/checkout@v4 - uses: ./.github/actions/clean-runner @@ -53,7 +53,6 @@ jobs: make bin/dex ./bin/dex serve $GITHUB_WORKSPACE/test/dex/config-dev.yaml & cd $GITHUB_WORKSPACE - - uses: ./.github/actions/check-diskspace - name: Run CI tests run: | make run-blackbox-ci @@ -79,5 +78,4 @@ jobs: env: AWS_ACCESS_KEY_ID: fake AWS_SECRET_ACCESS_KEY: fake - - uses: ./.github/actions/check-diskspace - uses: ./.github/actions/teardown-localstack diff --git a/.github/workflows/gc-stress-test.yaml b/.github/workflows/gc-stress-test.yaml index d0d62af637..e707174b98 100644 --- a/.github/workflows/gc-stress-test.yaml +++ b/.github/workflows/gc-stress-test.yaml @@ -14,7 +14,7 @@ permissions: read-all jobs: gc-referrers-stress-local: name: GC(with referrers) on filesystem with short interval - runs-on: ubuntu-latest + runs-on: ubuntu-latest-4-cores steps: - uses: actions/checkout@v4 - uses: ./.github/actions/clean-runner @@ -46,7 +46,7 @@ jobs: gc-stress-local: name: GC(without referrers) on filesystem with short interval - runs-on: ubuntu-latest + runs-on: ubuntu-latest-4-cores steps: - uses: actions/checkout@v4 - uses: ./.github/actions/clean-runner @@ -78,7 +78,7 @@ jobs: gc-referrers-stress-s3: name: GC(with referrers) on S3(minio) with short interval - runs-on: ubuntu-latest + runs-on: ubuntu-latest-8-cores steps: - uses: actions/checkout@v4 - uses: ./.github/actions/clean-runner @@ -154,7 +154,7 @@ jobs: gc-stress-s3: name: GC(without referrers) on S3(minio) with short interval - runs-on: ubuntu-latest + runs-on: ubuntu-latest-8-cores steps: - uses: actions/checkout@v4 - uses: ./.github/actions/clean-runner diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 6a936f908b..6cd341a722 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -14,7 +14,7 @@ permissions: read-all jobs: dedupe: name: Dedupe/restore blobs - runs-on: ubuntu-latest-16-cores + runs-on: ubuntu-latest-4-cores steps: - uses: actions/checkout@v4 - uses: ./.github/actions/clean-runner @@ -62,7 +62,7 @@ jobs: sync: name: Sync harness - runs-on: ubuntu-latest-16-cores + runs-on: ubuntu-latest-4-cores steps: - name: Check out source code uses: actions/checkout@v4 @@ -155,7 +155,7 @@ jobs: docker-image: name: Build docker image (for users still using Docker environments) - runs-on: ubuntu-latest-16-cores + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/clean-runner diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 5cef588526..c810044419 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -17,7 +17,6 @@ jobs: runs-on: ubuntu-latest-16-cores steps: - uses: actions/checkout@v4 - - uses: ./.github/actions/clean-runner - name: Install go uses: actions/setup-go@v4 with: @@ -38,7 +37,6 @@ jobs: cd $GITHUB_WORKSPACE go mod download - uses: ./.github/actions/setup-localstack - - uses: ./.github/actions/check-diskspace - name: run zot minimal tests run: | cd $GITHUB_WORKSPACE @@ -53,14 +51,12 @@ jobs: with: name: coverage-minimal path: coverage-minimal.txt - - uses: ./.github/actions/check-diskspace - uses: ./.github/actions/teardown-localstack test-run-extensions: name: Run zot with extensions tests runs-on: ubuntu-latest-16-cores steps: - uses: actions/checkout@v4 - - uses: ./.github/actions/clean-runner - uses: actions/setup-go@v4 with: cache: false @@ -94,14 +90,12 @@ jobs: with: name: coverage-extended path: coverage-extended.txt - - uses: ./.github/actions/check-diskspace - uses: ./.github/actions/teardown-localstack test-run-devmode: name: Running privileged tests on Linux runs-on: ubuntu-latest-16-cores steps: - uses: actions/checkout@v4 - - uses: ./.github/actions/clean-runner - uses: actions/setup-go@v4 with: cache: false @@ -120,7 +114,6 @@ jobs: run: | cd $GITHUB_WORKSPACE go mod download - - uses: ./.github/actions/check-diskspace - name: run zot development-mode unit tests (possibly using failure injection) run: make test-devmode - name: run zot privileged tests @@ -130,7 +123,6 @@ jobs: with: name: coverage-devmode path: coverage-dev-*.txt - - uses: ./.github/actions/check-diskspace test-coverage: name: Collect all test coverage runs-on: ubuntu-latest