Merge branch '34915-do-not-install-fog-aws-in-prepare_build' into 'master'

Resolve "Test/Production environment imparity in nokogiri"

Closes #34915

See merge request !12842

.gitlab-ci.yml

@@ -180,6 +180,7 @@ update-knapsack:
   <<: *only-canonical-masters
   stage: post-test
   script:
+    - retry gem install fog-aws mime-types
     - scripts/merge-reports ${KNAPSACK_RSPEC_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/rspec-pg_node_*.json
     - scripts/merge-reports ${KNAPSACK_SPINACH_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/spinach-pg_node_*.json
     - '[[ -z ${KNAPSACK_S3_BUCKET} ]] || scripts/sync-reports put $KNAPSACK_S3_BUCKET $KNAPSACK_RSPEC_SUITE_REPORT_PATH $KNAPSACK_SPINACH_SUITE_REPORT_PATH'

scripts/prepare_build.sh

@@ -10,7 +10,7 @@ fi
 
 # Only install knapsack after bundle install! Otherwise oddly some native
 # gems could not be found under some circumstance. No idea why, hours wasted.
-retry gem install knapsack fog-aws mime-types
+retry gem install knapsack
 
 cp config/gitlab.yml.example config/gitlab.yml