ci: inject cache tarballs instead of directory trees

ci: restore shared go and pnpm caches in integration and e2e jobs
revert: drop the testsci workflow and the --signoz-image option
2026-08-01 18:50:35 +01:00 · 2026-08-01 22:45:08 +05:30 · 2026-08-01 21:38:14 +05:30 · 2026-08-01 21:37:26 +05:30 · 2026-08-01 21:25:37 +05:30 · 2026-08-01 21:22:53 +05:30
2 changed files with 48 additions and 0 deletions
--- a/.github/workflows/e2eci.yaml
+++ b/.github/workflows/e2eci.yaml
@@ -75,6 +75,30 @@ jobs:
          docker rm pw
          echo "PLAYWRIGHT_BROWSERS_PATH=$RUNNER_TEMP/ms-playwright" >> "$GITHUB_ENV"
          cd tests/e2e && pnpm playwright install-deps ${{ matrix.project }}
+      # Restore-only: the cacheci workflow owns cache saves. Seeds the
+      # BuildKit cache mounts so the in-test image build is incremental.
+      - name: restore
+        id: restore
+        uses: actions/cache/restore@v4
+        with:
+          path: ${{ runner.temp }}/cacheci
+          key: tests-primary
+          restore-keys: |
+            tests-secondary
+      - name: inject
+        if: steps.restore.outputs.cache-matched-key != ''
+        run: |
+          cat > "$RUNNER_TEMP/inject.Dockerfile" <<'EOF'
+          FROM busybox:1.37
+          RUN --mount=type=cache,target=/root/.cache/go-build \
+              --mount=type=cache,target=/go/pkg/mod \
+              --mount=type=cache,target=/pnpm/store \
+              --mount=type=bind,target=/restored \
+              tar -xf /restored/go-build.tar -C /root/.cache/go-build && \
+              tar -xf /restored/go-mod.tar -C /go/pkg/mod && \
+              tar -xf /restored/pnpm-store.tar -C /pnpm/store
+          EOF
+          docker build -f "$RUNNER_TEMP/inject.Dockerfile" "$RUNNER_TEMP/cacheci"
      - name: bring-up-stack
        run: |
          cd tests && \
--- a/.github/workflows/integrationci.yaml
+++ b/.github/workflows/integrationci.yaml
@@ -110,6 +110,30 @@ jobs:
          sudo mv chromedriver-linux64/chromedriver /usr/local/bin/chromedriver
          chromedriver -version
          google-chrome-stable --version
+      # Restore-only: the cacheci workflow owns cache saves. Seeds the
+      # BuildKit cache mounts so the in-test image build is incremental.
+      - name: restore
+        id: restore
+        uses: actions/cache/restore@v4
+        with:
+          path: ${{ runner.temp }}/cacheci
+          key: tests-primary
+          restore-keys: |
+            tests-secondary
+      - name: inject
+        if: steps.restore.outputs.cache-matched-key != ''
+        run: |
+          cat > "$RUNNER_TEMP/inject.Dockerfile" <<'EOF'
+          FROM busybox:1.37
+          RUN --mount=type=cache,target=/root/.cache/go-build \
+              --mount=type=cache,target=/go/pkg/mod \
+              --mount=type=cache,target=/pnpm/store \
+              --mount=type=bind,target=/restored \
+              tar -xf /restored/go-build.tar -C /root/.cache/go-build && \
+              tar -xf /restored/go-mod.tar -C /go/pkg/mod && \
+              tar -xf /restored/pnpm-store.tar -C /pnpm/store
+          EOF
+          docker build -f "$RUNNER_TEMP/inject.Dockerfile" "$RUNNER_TEMP/cacheci"
      - name: run
        run: |
          cd tests && \
Author	SHA1	Message	Date
grandwizard28	6dc75b9b82	ci: inject cache tarballs instead of directory trees	2026-08-01 22:45:08 +05:30
grandwizard28	a4f2d7cfd1	ci: restore shared go and pnpm caches in integration and e2e jobs	2026-08-01 21:38:14 +05:30
grandwizard28	798f5776dd	revert: drop the testsci workflow and the --signoz-image option	2026-08-01 21:37:26 +05:30
grandwizard28	d76faaa470	ci: use singular --zeus-network-alias derived from a shared env var	2026-08-01 21:25:37 +05:30
grandwizard28	bbd8e74392	ci: rename flag to --zeus-network-aliases	2026-08-01 21:22:53 +05:30
grandwizard28	e59f1178a1	ci: collapse integrationci and e2eci into testsci with a shared image build	2026-08-01 20:56:16 +05:30
grandwizard28	d0531de837	feat(tests): add --signoz-image option to run a prebuilt image	2026-08-01 20:54:50 +05:30