From 3ac6839651e6c7f061c87d673338b2aafb0c0296 Mon Sep 17 00:00:00 2001
From: Mathias Kraus <elboberido@m-hias.de>
Date: Tue, 15 Oct 2024 00:15:15 +0200
Subject: [PATCH] iox-#1176 Increse cache sequence number for Cirrus CI

---
 .cirrus.yaml | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/.cirrus.yaml b/.cirrus.yaml
index 56447d7d39..38348d11cf 100644
--- a/.cirrus.yaml
+++ b/.cirrus.yaml
@@ -23,6 +23,12 @@ only_if: $CIRRUS_BRANCH == 'main'
                                   || $CIRRUS_BASE_BRANCH == 'iox-*'
                                   )
             )
+#
+# Global environment variables
+#
+
+env:
+    CACHE_SEQ_NR: 1
 
 #
 # Templates
@@ -126,7 +132,7 @@ ubuntu_22_04_aarch64_build_task:
   test_binaries_cache:
     folder: iox-tests-bin
     reupload_on_changes: true
-    fingerprint_key: $CIRRUS_OS_ubuntu_22_04_aarch64_test_binaries_cache_$CIRRUS_BRANCH
+    fingerprint_key: $CIRRUS_OS_ubuntu_22_04_aarch64_test_binaries_cache_${CACHE_SEQ_NR}_${CIRRUS_BRANCH}
   build_script:
     <<: *IOX_POSIX_CLEAN_BUILD_STRICT_WITH_ADDITIONAL_USER
   populate_test_binary_folder_script:
@@ -141,7 +147,7 @@ ubuntu_22_04_aarch64_test_task:
   test_binaries_cache:
     folder: iox-tests-bin
     reupload_on_changes: false
-    fingerprint_key: $CIRRUS_OS_ubuntu_22_04_aarch64_test_binaries_cache_$CIRRUS_BRANCH
+    fingerprint_key: $CIRRUS_OS_ubuntu_22_04_aarch64_test_binaries_cache_${CACHE_SEQ_NR}_${CIRRUS_BRANCH}
   test_script:
     <<: *IOX_RUN_TESTS
 
@@ -158,7 +164,7 @@ arch_linux_x64_gcc_8_3_aka_qnx_canary_build_task:
   test_binaries_cache:
     folder: iox-tests-bin
     reupload_on_changes: true
-    fingerprint_key: $CIRRUS_OS_archlinux_x64_gcc_8_3_aka_qnx_canary_test_binaries_cache_$CIRRUS_BRANCH
+    fingerprint_key: $CIRRUS_OS_archlinux_x64_gcc_8_3_aka_qnx_canary_test_binaries_cache_${CACHE_SEQ_NR}_${CIRRUS_BRANCH}
   env:
     # use GCC 8.3 which corresponds to QCC 8.3 on QNX 7.1
     CC: gcc-8
@@ -177,7 +183,7 @@ arch_linux_x64_gcc_8_3_aka_qnx_canary_test_task:
   test_binaries_cache:
     folder: iox-tests-bin
     reupload_on_changes: false
-    fingerprint_key: $CIRRUS_OS_archlinux_x64_gcc_8_3_aka_qnx_canary_test_binaries_cache_$CIRRUS_BRANCH
+    fingerprint_key: $CIRRUS_OS_archlinux_x64_gcc_8_3_aka_qnx_canary_test_binaries_cache_${CACHE_SEQ_NR}_${CIRRUS_BRANCH}
   test_script:
     <<: *IOX_RUN_TESTS
 
@@ -195,7 +201,7 @@ arch_linux_x64_build_task:
   test_binaries_cache:
     folder: iox-tests-bin
     reupload_on_changes: true
-    fingerprint_key: $CIRRUS_OS_archlinux_x64_test_binaries_cache_$CIRRUS_BRANCH
+    fingerprint_key: $CIRRUS_OS_archlinux_x64_test_binaries_cache_${CACHE_SEQ_NR}_${CIRRUS_BRANCH}
   build_script:
     <<: *IOX_POSIX_CLEAN_BUILD_STRICT_WITH_ADDITIONAL_USER
   populate_test_binary_folder_script:
@@ -211,7 +217,7 @@ arch_linux_x64_test_task:
   test_binaries_cache:
     folder: iox-tests-bin
     reupload_on_changes: false
-    fingerprint_key: $CIRRUS_OS_archlinux_x64_test_binaries_cache_$CIRRUS_BRANCH
+    fingerprint_key: $CIRRUS_OS_archlinux_x64_test_binaries_cache_${CACHE_SEQ_NR}_${CIRRUS_BRANCH}
   test_script:
     <<: *IOX_RUN_TESTS
 
@@ -229,7 +235,7 @@ freebsd_x64_build_task:
   test_binaries_cache:
     folder: iox-tests-bin
     reupload_on_changes: true
-    fingerprint_key: $CIRRUS_OS_freebsd_x64_test_binaries_cache_$CIRRUS_BRANCH
+    fingerprint_key: $CIRRUS_OS_freebsd_x64_test_binaries_cache_${CACHE_SEQ_NR}_${CIRRUS_BRANCH}
   setup_script:
     - pkg install -y cmake git ncurses bash wget
     - ln -s /usr/local/bin/bash /bin/bash
@@ -248,7 +254,7 @@ freebsd_x64_test_task:
   test_binaries_cache:
     folder: iox-tests-bin
     reupload_on_changes: false
-    fingerprint_key: $CIRRUS_OS_freebsd_x64_test_binaries_cache_$CIRRUS_BRANCH
+    fingerprint_key: $CIRRUS_OS_freebsd_x64_test_binaries_cache_${CACHE_SEQ_NR}_${CIRRUS_BRANCH}
   test_script:
     <<: *IOX_RUN_TESTS
 
@@ -266,7 +272,7 @@ macos_aarch64_build_task:
   test_binaries_cache:
     folder: iox-tests-bin
     reupload_on_changes: true
-    fingerprint_key: $CIRRUS_OS_macOS_aarch64_test_binaries_cache_$CIRRUS_BRANCH
+    fingerprint_key: $CIRRUS_OS_macOS_aarch64_test_binaries_cache_${CACHE_SEQ_NR}_${CIRRUS_BRANCH}
   setup_script:
     - brew install ncurses
   build_script:
@@ -284,7 +290,7 @@ macos_aarch64_test_task:
   test_binaries_cache:
     folder: iox-tests-bin
     reupload_on_changes: false
-    fingerprint_key: $CIRRUS_OS_macOS_aarch64_test_binaries_cache_$CIRRUS_BRANCH
+    fingerprint_key: $CIRRUS_OS_macOS_aarch64_test_binaries_cache_${CACHE_SEQ_NR}_${CIRRUS_BRANCH}
   env:
     # No timing tests on macOS
     GTEST_FILTER: "-*TimingTest*"