Add latest changes from gitlab-org/gitlab@master

4 files changed, 8 insertions, 8 deletions

diff --git a/.gitlab/ci/caching.gitlab-ci.yml b/.gitlab/ci/caching.gitlab-ci.yml
index 55f518c102d..4a7a843b514 100644
--- a/.gitlab/ci/caching.gitlab-ci.yml
+++ b/.gitlab/ci/caching.gitlab-ci.yml
@@ -33,7 +33,7 @@ cache-workhorse:
     - export GITLAB_ASSETS_HASH=$(bundle exec rake gitlab:assets:hash_sum)
     - source scripts/gitlab_component_helpers.sh
     - 'gitlab_assets_archive_doesnt_exist || { echoinfo "INFO: Exiting early as package exists."; exit 0; }'
-    - run_timed_command "bin/rake gitlab:assets:compile"
+    - assets_compile_script
     - echo -n "${GITLAB_ASSETS_HASH}" > "cached-assets-hash.txt"
     - run_timed_command "create_gitlab_assets_package"
     - run_timed_command "upload_gitlab_assets_package"
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml
index fa0fba54014..d7d27b91b13 100644
--- a/.gitlab/ci/frontend.gitlab-ci.yml
+++ b/.gitlab/ci/frontend.gitlab-ci.yml
@@ -1,7 +1,7 @@
 .yarn-install:
   script:
     - source scripts/utils.sh
-    - run_timed_command "retry yarn install --frozen-lockfile"
+    - yarn_install_script
 
 .storybook-yarn-install:
   script:
@@ -23,7 +23,7 @@
     WEBPACK_COMPILE_LOG_PATH: "tmp/webpack-output.log"
   stage: prepare
   script:
-    - !reference [.yarn-install, script]
+    - yarn_install_script
     - export GITLAB_ASSETS_HASH=$(bin/rake gitlab:assets:hash_sum)
     - 'echo "CACHE_ASSETS_AS_PACKAGE: ${CACHE_ASSETS_AS_PACKAGE}"'
     # The new strategy to cache assets as generic packages is experimental and can be disabled by removing the `CACHE_ASSETS_AS_PACKAGE` variable
@@ -32,7 +32,7 @@
         source scripts/gitlab_component_helpers.sh
         gitlab_assets_archive_doesnt_exist || run_timed_command "download_and_extract_gitlab_assets"
       fi
-    - run_timed_command "bin/rake gitlab:assets:compile"
+    - assets_compile_script
 
 compile-production-assets:
   extends:
@@ -294,7 +294,7 @@ coverage-frontend:
     - .yarn-cache
     - .frontend:rules:qa-frontend-node
   stage: test
-  dependencies: []
+  needs: []
   script:
     - !reference [.yarn-install, script]
     - run_timed_command "retry yarn run webpack-prod"
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index 9bfa7ccc36b..8f912dc8231 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -79,7 +79,7 @@ danger-review:
   before_script:
     - source scripts/utils.sh
     - bundle_install_script "--with danger"
-    - run_timed_command "retry yarn install --frozen-lockfile"
+    - yarn_install_script
   script:
     # ${DANGER_DANGERFILE} is used by Jihulab for customizing danger support: https://jihulab.com/gitlab-cn/gitlab/-/blob/main-jh/jh/.gitlab-ci.yml
     - >
diff --git a/.gitlab/ci/static-analysis.gitlab-ci.yml b/.gitlab/ci/static-analysis.gitlab-ci.yml
index e845e7eb88b..59ea665ae07 100644
--- a/.gitlab/ci/static-analysis.gitlab-ci.yml
+++ b/.gitlab/ci/static-analysis.gitlab-ci.yml
@@ -31,7 +31,7 @@ static-analysis:
     - .static-analysis:rules:static-analysis
   parallel: 2
   script:
-    - run_timed_command "retry yarn install --frozen-lockfile"
+    - yarn_install_script
     - scripts/static-analysis
 
 static-analysis as-if-foss:
@@ -84,7 +84,7 @@ eslint:
   variables:
     USE_BUNDLE_INSTALL: "false"
   script:
-    - run_timed_command "retry yarn install --frozen-lockfile"
+    - yarn_install_script
     - run_timed_command "yarn run lint:eslint:all"
 
 eslint as-if-foss: