fix: reduce test run time

Signed-off-by: Alexei Dodon <[email protected]>

.github/actions/check-diskspace/action.yaml

@@ -0,0 +1,21 @@
+name: 'Check disk space'
+description: 'Show available disk space'
+runs:
+  using: "composite"
+  steps:
+    - shell: bash
+      if: always()
+      run: |
+        cd $GITHUB_WORKSPACE
+        set -x
+        df -h
+        sudo ls -lRh /tmp/* || true
+        sudo du -sh /tmp || true
+        sudo du -sh /tmp/* || true
+        sudo find /tmp/ -size +5M | sudo xargs ls -lh
+        du -sh ./* || true
+        find ./ -size +5M   | xargs ls -lh
+        sudo du -sh /var/
+        sudo du -sh /var/lib/docker/
+        du -sh /home/runner/work/
+        set +x

.github/actions/setup-localstack/action.yaml

@@ -0,0 +1,20 @@
+name: 'Setup localstack service'
+description: 'Download & run localstack container'
+runs:
+  using: "composite"
+  steps:
+    - shell: bash
+      run: |
+            pip install localstack                    # Install LocalStack cli
+            docker pull localstack/localstack:1.3     # Make sure to pull the latest version of the image
+            localstack start -d                       # Start LocalStack in the background
+
+            echo "Waiting for LocalStack startup..."  # Wait 30 seconds for the LocalStack container
+            localstack wait -t 30                     # to become ready before timing out
+            echo "Startup complete"
+
+            aws --endpoint-url=http://localhost:4566 s3api create-bucket --bucket zot-storage --region us-east-2 --create-bucket-configuration="{\"LocationConstraint\": \"us-east-2\"}"
+            aws dynamodb --endpoint-url http://localhost:4566 --region "us-east-2" create-table --table-name BlobTable --attribute-definitions AttributeName=Digest,AttributeType=S --key-schema AttributeName=Digest,KeyType=HASH --provisioned-throughput ReadCapacityUnits=10,WriteCapacityUnits=5
+      env:
+        AWS_ACCESS_KEY_ID: fake
+        AWS_SECRET_ACCESS_KEY: fake

.github/actions/teardown-localstack/action.yaml

@@ -0,0 +1,8 @@
+name: 'Stop localstack'
+description: 'Stop localstack container'
+runs:
+  using: "composite"
+  steps:
+    - shell: bash
+      if: always()
+      run: localstack stop

.github/workflows/build.yaml

@@ -0,0 +1,103 @@
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+  release:
+    types:
+      - published
+name: build
+
+permissions: read-all
+
+jobs:
+  build-arch:
+    name: Build ZOT multiarch
+    permissions:
+      contents: write
+      packages: write
+    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:
+          cache: false
+          go-version: 1.20.x
+      - name: Cache go dependencies
+        id: cache-go-dependencies
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-mod-
+      - name: Cache go build output
+        id: cache-go-build
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cache/go-build
+          key: ${{ matrix.os }}-${{ matrix.arch }}-go-build-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ matrix.os }}-${{ matrix.arch }}-go-build-
+      - name: Install go dependencies
+        if: steps.cache-go-dependencies.outputs.cache-hit != 'true'
+        run: |
+          cd $GITHUB_WORKSPACE
+          go mod download
+      - name: Install other dependencies
+        run: |
+          cd $GITHUB_WORKSPACE
+          go install github.com/swaggo/swag/cmd/[email protected]
+          sudo apt-get update
+          sudo apt-get install rpm
+          sudo apt-get install snapd
+          sudo apt-get install libgpgme-dev libassuan-dev libbtrfs-dev libdevmapper-dev pkg-config
+          git clone https://github.com/containers/skopeo -b v1.12.0 $GITHUB_WORKSPACE/src/github.com/containers/skopeo
+          cd $GITHUB_WORKSPACE/src/github.com/containers/skopeo && \
+            make bin/skopeo && \
+            sudo cp bin/skopeo /usr/bin && \
+            rm -rf $GITHUB_WORKSPACE/src/github.com/containers/skopeo
+          cd $GITHUB_WORKSPACE
+          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
+        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'
+        run: |
+          bin/zot-linux-amd64 serve examples/config-search.json &
+          sleep 10
+          curl -X POST -H "Content-Type: application/json" -d @.pkg/debug/githubWorkflows/introspection-query.json http://localhost:5000/v2/_zot/ext/search | jq > bin/zot-gql-introspection-result.json
+          pkill zot
+
+      - if: github.event_name == 'release' && github.event.action == 'published'
+        name: Publish artifacts on releases
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: bin/z*
+          tag: ${{ github.ref }}
+          overwrite: true
+          file_glob: true

.github/workflows/codeql-analysis.yml → .github/workflows/codeql-analysis.yaml

@@ -56,9 +56,6 @@ jobs:
         cd $GITHUB_WORKSPACE
         go install github.com/swaggo/swag/cmd/[email protected]
         go mod download
-        go install github.com/wadey/gocovmerge@latest
-        go get -u github.com/swaggo/swag/cmd/swag
-        go mod download
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/compare-binary-size.yml → .github/workflows/compare-binary-size.yaml

@@ -36,11 +36,11 @@ jobs:
           [[ $BINSIZE -eq $BINSIZE_MAIN ]] && echo "zot-minimal binary size is not affected by PR" && exit 0
 
           if [[ $BINSIZE -gt $BINSIZE_MAIN ]]; then \
-            PERCENTAGE=$(echo "scale=2; (($BINSIZE-$BINSIZE_MAIN)*100)/$BINSIZE_MAIN" | bc); \
+            PERCENTAGE=$(printf '%.*f\n' 2 $(echo "scale=2; (($BINSIZE-$BINSIZE_MAIN)*100)/$BINSIZE_MAIN" | bc)); \
             echo "zot minimal binary increased by $PERCENTAGE% comparing with main"; \
             if ((`bc <<< "$PERCENTAGE>=1.0"`)); then exit 1; fi; \
           else \
-            PERCENTAGE=$(echo "scale=2; (($BINSIZE_MAIN-$BINSIZE)*100)/$BINSIZE_MAIN" | bc); \
+            PERCENTAGE=$(printf '%.*f\n' 2 $(echo "scale=2; (($BINSIZE_MAIN-$BINSIZE)*100)/$BINSIZE_MAIN" | bc)); \
             echo "zot minimal binary decreased by $PERCENTAGE% comparing with main"; \
           fi
       - if: always()
@@ -61,11 +61,11 @@ jobs:
           [[ $BINSIZE -eq $BINSIZE_MAIN ]] && echo "zb binary size is not affected by PR" && exit 0
 
           if [[ $BINSIZE -gt $BINSIZE_MAIN ]]; then \
-            PERCENTAGE=$(echo "scale=2; (($BINSIZE-$BINSIZE_MAIN)*100)/$BINSIZE_MAIN" | bc); \
+            PERCENTAGE=$(printf '%.*f\n' 2 $(echo "scale=2; (($BINSIZE-$BINSIZE_MAIN)*100)/$BINSIZE_MAIN" | bc)); \
             echo "zb binary increased by $PERCENTAGE% comparing with main"; \
             if ((`bc <<< "$PERCENTAGE>=1.0"`)); then exit 1; fi; \
           else \
-            PERCENTAGE=$(echo "scale=2; (($BINSIZE_MAIN-$BINSIZE)*100)/$BINSIZE_MAIN" | bc); \
+            PERCENTAGE=$(printf '%.*f\n' 2 $(echo "scale=2; (($BINSIZE_MAIN-$BINSIZE)*100)/$BINSIZE_MAIN" | bc)); \
             echo "zb binary decreased by $PERCENTAGE% comparing with main"; \
           fi
       - if: always()
@@ -86,10 +86,10 @@ jobs:
           [[ $BINSIZE -eq $BINSIZE_MAIN ]] && echo "zli binary size is not affected by PR" && exit 0
 
           if [[ $BINSIZE -gt $BINSIZE_MAIN ]]; then \
-            PERCENTAGE=$(echo "scale=2; (($BINSIZE-$BINSIZE_MAIN)*100)/$BINSIZE_MAIN" | bc); \
+            PERCENTAGE=$(printf '%.*f\n' 2 $(echo "scale=2; (($BINSIZE-$BINSIZE_MAIN)*100)/$BINSIZE_MAIN" | bc)); \
             echo "zli binary increased by $PERCENTAGE% comparing with main"; \
             if ((`bc <<< "$PERCENTAGE>=1.0"`)); then exit 1; fi; \
           else \
-            PERCENTAGE=$(echo "scale=2; (($BINSIZE_MAIN-$BINSIZE)*100)/$BINSIZE_MAIN" | bc); \
+            PERCENTAGE=$(printf '%.*f\n' 2 $(echo "scale=2; (($BINSIZE_MAIN-$BINSIZE)*100)/$BINSIZE_MAIN" | bc)); \
             echo "zli binary decreased by $PERCENTAGE% comparing with main"; \
           fi

.github/workflows/dco.yml → .github/workflows/dco.yaml

@@ -1,4 +1,3 @@
-# .github/workflows/dco.yml
 name: DCO
 on:
   pull_request:

.github/workflows/golangci-lint.yaml

@@ -20,7 +20,7 @@ jobs:
           cache: false
           go-version: '1.20'
       - uses: actions/checkout@v4
-      - name: golangci-lint
+      - name: Run linter with GH action
         uses: golangci/golangci-lint-action@v3
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
@@ -41,3 +41,6 @@ jobs:
 
           # Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
           # skip-build-cache: true
+      - name: Run linter from make target
+        run: |
+          make check

.github/workflows/ci-cd.yml → .github/workflows/publish.yaml

@@ -8,169 +8,11 @@ on:
   release:
     types:
       - published
-name: build-test
+name: publish
 
 permissions: read-all
 
 jobs:
-  build-test-arch:
-    name: Build and test ZOT
-    permissions:
-      contents: write
-      packages: write
-    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:
-          cache: false
-          go-version: 1.20.x
-      - name: Cache go dependencies
-        id: cache-go-dependencies
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-mod-
-      - name: Cache go build output
-        id: cache-go-build
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache/go-build
-          key: ${{ matrix.os }}-${{ matrix.arch }}-go-build-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ matrix.os }}-${{ matrix.arch }}-go-build-
-      - name: Install go dependencies
-        if: steps.cache-go-dependencies.outputs.cache-hit != 'true'
-        run: |
-          cd $GITHUB_WORKSPACE
-          go mod download
-      - name: Install other dependencies
-        run: |
-          cd $GITHUB_WORKSPACE
-          go install github.com/swaggo/swag/cmd/[email protected]
-          sudo apt-get update
-          sudo apt-get install rpm
-          sudo apt-get install snapd
-          sudo apt-get install libgpgme-dev libassuan-dev libbtrfs-dev libdevmapper-dev pkg-config
-          git clone https://github.com/containers/skopeo -b v1.12.0 $GITHUB_WORKSPACE/src/github.com/containers/skopeo
-          cd $GITHUB_WORKSPACE/src/github.com/containers/skopeo && \
-            make bin/skopeo && \
-            sudo cp bin/skopeo /usr/bin && \
-            rm -rf $GITHUB_WORKSPACE/src/github.com/containers/skopeo
-          cd $GITHUB_WORKSPACE
-          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
-          go install github.com/wadey/gocovmerge@latest
-
-      - if: matrix.os == 'linux' && matrix.arch == 'amd64'
-        name: Setup localstack service
-        run: |
-            pip install localstack                    # Install LocalStack cli
-            docker pull localstack/localstack:1.3     # Make sure to pull the latest version of the image
-            localstack start -d                       # Start LocalStack in the background
-
-            echo "Waiting for LocalStack startup..."  # Wait 30 seconds for the LocalStack container
-            localstack wait -t 30                     # to become ready before timing out
-            echo "Startup complete"
-
-            aws --endpoint-url=http://localhost:4566 s3api create-bucket --bucket zot-storage --region us-east-2 --create-bucket-configuration="{\"LocationConstraint\": \"us-east-2\"}"
-            aws dynamodb --endpoint-url http://localhost:4566 --region "us-east-2" create-table --table-name BlobTable --attribute-definitions AttributeName=Digest,AttributeType=S --key-schema AttributeName=Digest,KeyType=HASH --provisioned-throughput ReadCapacityUnits=10,WriteCapacityUnits=5
-        env:
-          AWS_ACCESS_KEY_ID: fake
-          AWS_SECRET_ACCESS_KEY: fake
-
-      - name: Check disk space before build
-        run: |
-          cd $GITHUB_WORKSPACE
-          set -x
-          df -h
-          sudo ls -lRh /tmp/* || true
-          sudo du -sh /tmp || true
-          sudo du -sh /tmp/* || true
-          sudo find /tmp/ -size +5M | sudo xargs ls -lh
-          du -sh ./* || true
-          find ./ -size +5M   | xargs ls -lh
-          sudo du -sh /var/
-          sudo du -sh /var/lib/docker/
-          du -sh /home/runner/work/
-          set +x
-
-      - name: Run build and test
-        timeout-minutes: 80
-        run: |
-          echo "Building for $OS:$ARCH"
-          cd $GITHUB_WORKSPACE
-          if [[ $OS == "linux" && $ARCH == "amd64" ]]; then
-            make
-            sudo env "PATH=$PATH" make privileged-test
-          else
-            make binary binary-minimal binary-debug cli bench exporter-minimal
-          fi
-        env:
-          S3MOCK_ENDPOINT: localhost:4566
-          DYNAMODBMOCK_ENDPOINT: http://localhost:4566
-          AWS_ACCESS_KEY_ID: fake
-          AWS_SECRET_ACCESS_KEY: fake
-          OS: ${{ matrix.os }}
-          ARCH: ${{ matrix.arch }}
-
-      - if: matrix.os == 'linux' && matrix.arch == 'amd64'
-        name: Stop localstack
-        run: |
-            localstack stop
-
-      - name: Check disk space after build
-        if: always()
-        run: |
-          cd $GITHUB_WORKSPACE
-          set -x
-          df -h
-          sudo ls -lRh /tmp/* || true
-          sudo du -sh /tmp || true
-          sudo du -sh /tmp/* || true
-          sudo find /tmp/ -size +5M | sudo xargs ls -lh
-          du -sh ./* || true
-          find ./ -size +5M   | xargs ls -lh
-          sudo du -sh /var/
-          sudo du -sh /var/lib/docker/
-          du -sh /home/runner/work/
-          set +x
-
-      - name: Upload code coverage
-        uses: codecov/codecov-action@v3
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-
-      - name: Generate GraphQL Introspection JSON on Release
-        if: github.event_name == 'release' && github.event.action == 'published' && matrix.os == 'linux' && matrix.arch == 'amd64'
-        run: |
-          bin/zot-linux-amd64 serve examples/config-search.json &
-          sleep 10
-          curl -X POST -H "Content-Type: application/json" -d @.pkg/debug/githubWorkflows/introspection-query.json http://localhost:5000/v2/_zot/ext/search | jq > bin/zot-gql-introspection-result.json
-          pkill zot
-
-      - if: github.event_name == 'release' && github.event.action == 'published'
-        name: Publish artifacts on releases
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: bin/z*
-          tag: ${{ github.ref }}
-          overwrite: true
-          file_glob: true
-
   push-image:
     if: github.event_name == 'release' && github.event.action== 'published'
     name: Push OCI images to GitHub Packages