Merge branch 'sh-use-image-in-cache-key' into 'master'

Use CI image name in gems cache key

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6801



Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Jason Plum <jplum@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>

.gitlab-ci.yml

@@ -90,6 +90,12 @@ variables:
       - gems
     policy: pull
+.gems-cache-os-dependent:
+  cache:
+    key: "gems-cache-${CI_JOB_IMAGE}${CACHE_KEY_SUFFIX}"
+    paths:
+      - gems
+
 before_script:
   - echo "PIPELINE_TYPE detected as ${PIPELINE_TYPE}"
   # Exit early if building on an OS for which we don't provide the specified

gitlab-ci-config/gitlab-com.yml

@@ -98,7 +98,7 @@
     - if: '$PIPELINE_TYPE == "TRIGGER_CACHE_UPDATE_PIPELINE"'
 .spec_template: &spec_template
-  extends: .gems-cache
+  extends: .gems-cache-os-dependent
   stage: tests
   before_script:
     # These jobs will not be run on dev, so we set ALTERNATIVE_SOURCES to true