ci: resource tuning for faster runs (#1967)

Signed-off-by: Alexei Dodon <[email protected]>
project-zot · Nov 15, 2023 · 8dd06c6 · 8dd06c6
1 parent dd1c73c
commit 8dd06c6
Show file tree

Hide file tree

Showing 31 changed files with 577 additions and 413 deletions.
diff --git 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-8-cores
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -18,15 +18,14 @@ jobs:
     permissions:
       contents: write
       packages: write
-    runs-on: ubuntu-latest-16-cores
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         os: [linux, darwin, freebsd]
         arch: [amd64, arm64]
     steps:
       - name: Check out source code
         uses: actions/checkout@v4
-      - uses: ./.github/actions/clean-runner
       - name: Install go
         uses: actions/setup-go@v4
         with:
@@ -72,17 +71,15 @@ jobs:
           curl -Lo notation.tar.gz https://github.com/notaryproject/notation/releases/download/v1.0.0-rc.4/notation_1.0.0-rc.4_linux_amd64.tar.gz
           sudo tar xvzf notation.tar.gz -C /usr/bin notation
           rm -f notation.tar.gz
-      - uses: ./.github/actions/check-diskspace
       - name: Run build
-        timeout-minutes: 80
+        timeout-minutes: 10
         run: |
           echo "Building for $OS:$ARCH"
           cd $GITHUB_WORKSPACE
           make binary binary-minimal binary-debug cli bench exporter-minimal
         env:
           OS: ${{ matrix.os }}
           ARCH: ${{ matrix.arch }}
-      - uses: ./.github/actions/check-diskspace
 
       - name: Generate GraphQL Introspection JSON on Release
         if: github.event_name == 'release' && github.event.action == 'published' && matrix.os == 'linux' && matrix.arch == 'amd64'

diff --git 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
@@ -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
@@ -14,10 +14,9 @@ permissions: read-all
 jobs:
   client-tools:
     name: Check client tools
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-16-cores
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/clean-runner
       - uses: actions/setup-go@v4
         with:
           cache: false
@@ -53,7 +52,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 +77,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
@@ -14,10 +14,9 @@ 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-8-cores
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/clean-runner
       - uses: actions/setup-go@v4
         with:
           cache: false
@@ -46,10 +45,9 @@ jobs:
 
   gc-stress-local:
     name: GC(without referrers) on filesystem with short interval
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-8-cores
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/clean-runner
       - uses: actions/setup-go@v4
         with:
           cache: false
@@ -78,10 +76,9 @@ 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
       - uses: actions/setup-go@v4
         with:
           cache: false
@@ -154,10 +151,9 @@ 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
       - uses: actions/setup-go@v4
         with:
           cache: false

diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml
@@ -13,7 +13,7 @@ permissions:
 jobs:
   golangci:
     name: lint
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-8-cores
     steps:
       - uses: actions/setup-go@v4
         with:

diff --git a/.github/workflows/gqlgen.yaml b/.github/workflows/gqlgen.yaml
@@ -19,7 +19,7 @@ permissions: read-all
 jobs:
   gqlgen:
     name: Check GQL generation
-    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/nightly.yaml b/.github/workflows/nightly.yaml
@@ -14,7 +14,7 @@ permissions: read-all
 jobs:
   dedupe:
     name: Dedupe/restore blobs
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest-4-cores
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v3
@@ -61,7 +61,7 @@ jobs:
 
   sync:
     name: Sync harness
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest-4-cores
     steps:
       - name: Check out source code
         uses: actions/checkout@v4
@@ -153,7 +153,7 @@ jobs:
 
   docker-image:
     name: Build docker image (for users still using Docker environments)
-    runs-on: ubuntu-latest-4-cores
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Check out source code

diff --git 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

diff --git a/.github/workflows/web-scan.yaml b/.github/workflows/web-scan.yaml
@@ -15,7 +15,7 @@ permissions:
 
 jobs:
   zap_scan:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-4-cores
     name: Scan ZOT using ZAP
     strategy:
       matrix:

diff --git a/Makefile b/Makefile
@@ -486,24 +486,8 @@ run-blackbox-tests: $(BATS_TEST_FILE_PATH) check-blackbox-prerequisites binary b
 
 .PHONY: run-blackbox-ci
 run-blackbox-ci: check-blackbox-prerequisites binary binary-minimal cli
-	# ideally we would run a single bats command but too much disk space would be used at once
-	echo running CI bats tests; \
-	$(BATS) $(BATS_FLAGS) test/blackbox/pushpull.bats && \
-	$(BATS) $(BATS_FLAGS) test/blackbox/pushpull_authn.bats && \
-	$(BATS) $(BATS_FLAGS) test/blackbox/delete_images.bats && \
-	$(BATS) $(BATS_FLAGS) test/blackbox/referrers.bats && \
-	$(BATS) $(BATS_FLAGS) test/blackbox/metadata.bats && \
-	$(BATS) $(BATS_FLAGS) test/blackbox/anonymous_policy.bats && \
-	$(BATS) $(BATS_FLAGS) test/blackbox/annotations.bats && \
-	$(BATS) $(BATS_FLAGS) test/blackbox/detect_manifest_collision.bats && \
-	$(BATS) $(BATS_FLAGS) test/blackbox/cve.bats && \
-	$(BATS) $(BATS_FLAGS) test/blackbox/sync.bats && \
-	$(BATS) $(BATS_FLAGS) test/blackbox/sync_docker.bats && \
-	$(BATS) $(BATS_FLAGS) test/blackbox/sync_replica_cluster.bats && \
-	$(BATS) $(BATS_FLAGS) test/blackbox/scrub.bats && \
-	$(BATS) $(BATS_FLAGS) test/blackbox/garbage_collect.bats && \
-	$(BATS) $(BATS_FLAGS) test/blackbox/metrics.bats && \
-	$(BATS) $(BATS_FLAGS) test/blackbox/metrics_minimal.bats
+	echo running CI bats tests concurently
+	BATS_FLAGS="$(BATS_FLAGS)" test/blackbox/ci.sh
 
 .PHONY: run-blackbox-cloud-ci
 run-blackbox-cloud-ci: check-blackbox-prerequisites check-awslocal binary $(BATS)