Merge branch '205192-update-rails-cache-key' into 'master'

Update cache key to properly build the 'pg' gem

Closes #205192

See merge request gitlab-org/gitlab!24971

.gitlab/ci/frontend.gitlab-ci.yml

@@ -93,7 +93,7 @@
     DOCKER_DRIVER: overlay2
     DOCKER_HOST: tcp://docker:2375
   cache:
-    key: "assets-compile:production:vendor_ruby:.yarn-cache:tmp_cache_assets_sprockets:tmp_cache_webpack:v7"
+    key: "assets-compile:production:vendor_ruby:.yarn-cache:tmp_cache_assets_sprockets:tmp_cache_webpack:v9"
   artifacts:
     name: webpack-report
     expire_in: 31d
@@ -152,7 +152,7 @@ gitlab:assets:compile pull-cache:
     # we override the max_old_space_size to prevent OOM errors
     NODE_OPTIONS: --max_old_space_size=3584
   cache:
-    key: "assets-compile:v8"
+    key: "assets-compile:v9"
   artifacts:
     expire_in: 7d
     paths:
@@ -180,7 +180,7 @@ compile-assets pull-push-cache foss:
       when: on_success
   cache:
     policy: pull-push
-    key: "assets-compile:v8:foss"
+    key: "assets-compile:v9:foss"
 
 compile-assets pull-cache:
   extends: .compile-assets-metadata
@@ -203,7 +203,7 @@ compile-assets pull-cache foss:
       when: on_success
   cache:
     policy: pull
-    key: "assets-compile:v8:foss"
+    key: "assets-compile:v9:foss"
 
 .frontend-job-base:
   extends:

.gitlab/ci/global.gitlab-ci.yml

@@ -25,7 +25,7 @@
 # Jobs that only need to pull cache
 .default-cache:
   cache:
-    key: "debian-stretch-ruby-2.6.5-node-12.x"
+    key: "debian-stretch-ruby-2.6.5-pg9.6-node-12.x"
     paths:
       - .go/pkg/mod
       - vendor/ruby

.gitlab/ci/rails.gitlab-ci.yml

@@ -143,7 +143,7 @@ static-analysis:
   script:
     - scripts/static-analysis
   cache:
-    key: "debian-stretch-ruby-2.6-and-rubocop"
+    key: "debian-stretch-ruby-2.6-pg9.6-rubocop"
     paths:
       - vendor/ruby
       - tmp/rubocop_cache