From 64b263af0912758778d70ac2b45db5b73a48e40e Mon Sep 17 00:00:00 2001
From: Jarno Rajahalme <jarno@isovalent.com>
Date: Wed, 11 Oct 2023 09:33:47 +0300
Subject: [PATCH] v1.26: Fix archive tags to not collide with main

Use the release branch name instead of the main in archive tags, like in
v1.24.

Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
---
 .github/workflows/build-envoy-image-ci.yaml       |  2 +-
 .github/workflows/build-envoy-images-release.yaml | 14 +++++++-------
 .github/workflows/ci-tests.yaml                   |  2 +-
 .github/workflows/cilium-integration-tests.yaml   |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-envoy-image-ci.yaml b/.github/workflows/build-envoy-image-ci.yaml
index d89344c24..91c42fd38 100644
--- a/.github/workflows/build-envoy-image-ci.yaml
+++ b/.github/workflows/build-envoy-image-ci.yaml
@@ -85,7 +85,7 @@ jobs:
         platforms: linux/amd64,linux/arm64
         build-args: |
           BUILDER_BASE=quay.io/cilium/cilium-envoy-builder-dev:${{ env.BAZEL_VERSION }}-${{ env.BUILDER_DOCKER_HASH }}
-          ARCHIVE_IMAGE=quay.io/${{ github.repository_owner }}/cilium-envoy-builder:main-archive-latest
+          ARCHIVE_IMAGE=quay.io/${{ github.repository_owner }}/cilium-envoy-builder:${{ github.base_ref }}-archive-latest
           BAZEL_BUILD_OPTS=--remote_upload_local_results=false
         cache-from: type=local,src=/tmp/buildx-cache
         cache-to: type=local,dest=/tmp/buildx-cache,mode=max
diff --git a/.github/workflows/build-envoy-images-release.yaml b/.github/workflows/build-envoy-images-release.yaml
index e74ac3941..b16b5b090 100644
--- a/.github/workflows/build-envoy-images-release.yaml
+++ b/.github/workflows/build-envoy-images-release.yaml
@@ -83,13 +83,13 @@ jobs:
           BAZEL_BUILD_OPTS="--jobs=HOST_CPUS*.75"
           BAZEL_TEST_OPTS=--test_timeout=300 --local_test_jobs=1
         push: true
-        tags: quay.io/${{ github.repository_owner }}/cilium-envoy-builder:test-main-archive-latest
+        tags: quay.io/${{ github.repository_owner }}/cilium-envoy-builder:test-${{ github.ref_name }}-archive-latest
 
     - name: Cache Docker layers
       uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
       with:
         path: /tmp/buildx-cache
-        key: docker-cache-tests
+        key: docker-cache-tests-${{ github.ref_name }}
 
     - name: Clear cache
       run: rm -rf /tmp/buildx-cache/*
@@ -104,7 +104,7 @@ jobs:
         platforms: linux/amd64
         build-args: |
           BUILDER_BASE=quay.io/${{ github.repository_owner }}/cilium-envoy-builder:test-${{ env.BAZEL_VERSION }}-${{ env.BUILDER_DOCKER_HASH }}
-          ARCHIVE_IMAGE=quay.io/${{ github.repository_owner }}/cilium-envoy-builder:test-main-archive-latest
+          ARCHIVE_IMAGE=quay.io/${{ github.repository_owner }}/cilium-envoy-builder:test-${{ github.ref_name }}-archive-latest
           BAZEL_BUILD_OPTS=--remote_upload_local_results=false
           BAZEL_TEST_OPTS=--test_timeout=300 --local_test_jobs=1
         cache-to: type=local,dest=/tmp/buildx-cache,mode=max
@@ -171,20 +171,20 @@ jobs:
           COPY_CACHE_EXT=.new
           BAZEL_BUILD_OPTS="--jobs=HOST_CPUS*.75"
         push: true
-        tags: quay.io/${{ github.repository_owner }}/cilium-envoy-builder:main-archive-latest
+        tags: quay.io/${{ github.repository_owner }}/cilium-envoy-builder:${{ github.ref_name }}-archive-latest
 
     - name: Cache Docker layers
       uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
       with:
         path: /tmp/buildx-cache
-        key: docker-cache-master
+        key: docker-cache-${{ github.ref_name }}
 
     - name: Clear cache
       run: |
         rm -rf /tmp/buildx-cache/*
         docker buildx prune -f
 
-    - name: Multi-arch build & push master latest
+    - name: Multi-arch build & push ${{ github.ref_name }} latest
       uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # v4.1.1
       id: docker_build_cd
       with:
@@ -195,7 +195,7 @@ jobs:
         build-args: |
           BUILDER_BASE=quay.io/${{ github.repository_owner }}/cilium-envoy-builder:${{ env.BAZEL_VERSION }}-${{ env.BUILDER_DOCKER_HASH }}
           BAZEL_BUILD_OPTS=--remote_upload_local_results=false
-          ARCHIVE_IMAGE=quay.io/${{ github.repository_owner }}/cilium-envoy-builder:main-archive-latest
+          ARCHIVE_IMAGE=quay.io/${{ github.repository_owner }}/cilium-envoy-builder:${{ github.ref_name }}-archive-latest
         cache-to: type=local,dest=/tmp/buildx-cache,mode=max
         push: true
         tags: |
diff --git a/.github/workflows/ci-tests.yaml b/.github/workflows/ci-tests.yaml
index a892713d5..5d67e2510 100644
--- a/.github/workflows/ci-tests.yaml
+++ b/.github/workflows/ci-tests.yaml
@@ -105,7 +105,7 @@ jobs:
           platforms: linux/amd64
           build-args: |
             BUILDER_BASE=quay.io/${{ github.repository_owner }}/cilium-envoy-builder-dev:test-${{ env.BAZEL_VERSION }}-${{ env.BUILDER_DOCKER_HASH }}
-            ARCHIVE_IMAGE=quay.io/${{ github.repository_owner }}/cilium-envoy-builder:test-main-archive-latest
+            ARCHIVE_IMAGE=quay.io/${{ github.repository_owner }}/cilium-envoy-builder:test-${{ github.base_ref }}-archive-latest
             BAZEL_BUILD_OPTS=--remote_upload_local_results=false
             BAZEL_TEST_OPTS=--test_timeout=300 --local_test_jobs=1
           cache-from: type=local,src=/tmp/buildx-cache
diff --git a/.github/workflows/cilium-integration-tests.yaml b/.github/workflows/cilium-integration-tests.yaml
index c585b9f27..3d841906c 100644
--- a/.github/workflows/cilium-integration-tests.yaml
+++ b/.github/workflows/cilium-integration-tests.yaml
@@ -9,7 +9,7 @@ on:
     - reopened
     - synchronize
     branches:
-    - main
+    - v1.25
   issue_comment:
     types:
     - created