Skip to content
代码片段 群组 项目
未验证 提交 33e3b22c 编辑于 作者: Rémy Coutable's avatar Rémy Coutable
浏览文件

ci: Don't use repo from artifacts for critical jobs


Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
上级 34c0263b
No related branches found
No related tags found
无相关合并请求
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
- .default-retry - .default-retry
- .default-before_script - .default-before_script
- .assets-compile-cache - .assets-compile-cache
- .repo-from-artifacts
image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}-node-${NODE_VERSION}:rubygems-${RUBYGEMS_VERSION}-git-2.33-lfs-2.9-yarn-1.22-graphicsmagick-1.3.36 image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}-node-${NODE_VERSION}:rubygems-${RUBYGEMS_VERSION}-git-2.33-lfs-2.9-yarn-1.22-graphicsmagick-1.3.36
variables: variables:
SETUP_DB: "false" SETUP_DB: "false"
...@@ -21,6 +20,7 @@ ...@@ -21,6 +20,7 @@
BROWSERSLIST_IGNORE_OLD_DATA: "true" BROWSERSLIST_IGNORE_OLD_DATA: "true"
WEBPACK_COMPILE_LOG_PATH: "tmp/webpack-output.log" WEBPACK_COMPILE_LOG_PATH: "tmp/webpack-output.log"
stage: prepare stage: prepare
needs: []
script: script:
- yarn_install_script - yarn_install_script
- export GITLAB_ASSETS_HASH=$(bin/rake gitlab:assets:hash_sum) - export GITLAB_ASSETS_HASH=$(bin/rake gitlab:assets:hash_sum)
...@@ -71,7 +71,6 @@ follow-up:compile-production-assets: ...@@ -71,7 +71,6 @@ follow-up:compile-production-assets:
- compile-production-assets - compile-production-assets
- .qa:rules:follow-up-e2e - .qa:rules:follow-up-e2e
needs: needs:
- !reference [compile-production-assets, needs]
- manual:e2e-test-pipeline-generate - manual:e2e-test-pipeline-generate
compile-test-assets: compile-test-assets:
...@@ -118,9 +117,9 @@ retrieve-frontend-fixtures: ...@@ -118,9 +117,9 @@ retrieve-frontend-fixtures:
SETUP_DB: "false" SETUP_DB: "false"
extends: extends:
- .default-retry - .default-retry
- .repo-from-artifacts
- .frontend:rules:default-frontend-jobs - .frontend:rules:default-frontend-jobs
stage: prepare stage: prepare
needs: []
script: script:
- source scripts/utils.sh - source scripts/utils.sh
- source scripts/gitlab_component_helpers.sh - source scripts/gitlab_component_helpers.sh
...@@ -149,6 +148,7 @@ retrieve-frontend-fixtures: ...@@ -149,6 +148,7 @@ retrieve-frontend-fixtures:
- "setup-test-env" - "setup-test-env"
- "retrieve-tests-metadata" - "retrieve-tests-metadata"
- "retrieve-frontend-fixtures" - "retrieve-frontend-fixtures"
# it's ok to wait for the repo artifact as we're waiting for setup-test-env (which takes longer than clone-gitlab-repo) anyway
- !reference [.repo-from-artifacts, needs] - !reference [.repo-from-artifacts, needs]
variables: variables:
# Don't add `CRYSTALBALL: "false"` here as we're enabling Crystalball for scheduled pipelines (in `.gitlab-ci.yml`), so that we get coverage data # Don't add `CRYSTALBALL: "false"` here as we're enabling Crystalball for scheduled pipelines (in `.gitlab-ci.yml`), so that we get coverage data
...@@ -196,6 +196,7 @@ upload-frontend-fixtures: ...@@ -196,6 +196,7 @@ upload-frontend-fixtures:
- .frontend:rules:upload-frontend-fixtures - .frontend:rules:upload-frontend-fixtures
stage: fixtures stage: fixtures
needs: needs:
# it's ok to wait for the repo artifact as we're waiting for the fixtures (which wait for the repo artifact) anyway
- !reference [.repo-from-artifacts, needs] - !reference [.repo-from-artifacts, needs]
- !reference [.with-fixtures-needs, needs] - !reference [.with-fixtures-needs, needs]
script: script:
...@@ -212,9 +213,9 @@ graphql-schema-dump: ...@@ -212,9 +213,9 @@ graphql-schema-dump:
- .default-retry - .default-retry
- .ruby-cache - .ruby-cache
- .default-before_script - .default-before_script
- .repo-from-artifacts
- .frontend:rules:default-frontend-jobs - .frontend:rules:default-frontend-jobs
stage: fixtures stage: fixtures
needs: []
script: script:
- bundle exec rake gitlab:graphql:schema:dump - bundle exec rake gitlab:graphql:schema:dump
artifacts: artifacts:
...@@ -228,7 +229,6 @@ graphql-schema-dump: ...@@ -228,7 +229,6 @@ graphql-schema-dump:
extends: extends:
- .default-retry - .default-retry
- .yarn-cache - .yarn-cache
- .repo-from-artifacts
variables: variables:
# Disable warnings in browserslist which can break on backports # Disable warnings in browserslist which can break on backports
# https://github.com/browserslist/browserslist/blob/a287ec6/node.js#L367-L384 # https://github.com/browserslist/browserslist/blob/a287ec6/node.js#L367-L384
...@@ -244,6 +244,7 @@ jest-build-cache: ...@@ -244,6 +244,7 @@ jest-build-cache:
extends: extends:
- .frontend-test-base - .frontend-test-base
- .frontend:rules:jest - .frontend:rules:jest
needs: []
artifacts: artifacts:
name: jest-cache name: jest-cache
expire_in: 12h expire_in: 12h
...@@ -283,7 +284,6 @@ jest: ...@@ -283,7 +284,6 @@ jest:
- .frontend-test-base - .frontend-test-base
- .frontend:rules:jest - .frontend:rules:jest
needs: needs:
- !reference [.frontend-test-base, needs]
- job: jest-build-cache - job: jest-build-cache
optional: true optional: true
artifacts: artifacts:
...@@ -303,9 +303,12 @@ jest: ...@@ -303,9 +303,12 @@ jest:
jest-with-fixtures: jest-with-fixtures:
extends: extends:
- jest - jest
- .repo-from-artifacts
- .frontend:rules:jest - .frontend:rules:jest
needs: needs:
- !reference [jest, needs] - !reference [jest, needs]
# it's ok to wait for the repo artifact as we're waiting for the fixtures (which wait for the repo artifact) anyway
- !reference [.repo-from-artifacts, needs]
- !reference [.with-fixtures-needs, needs] - !reference [.with-fixtures-needs, needs]
parallel: 2 parallel: 2
script: script:
...@@ -317,7 +320,6 @@ jest vue3: ...@@ -317,7 +320,6 @@ jest vue3:
- .frontend:rules:jest-vue3 - .frontend:rules:jest-vue3
- .vue3 - .vue3
needs: needs:
- !reference [.repo-from-artifacts, needs]
- !reference [.with-jest-build-cache-vue3-needs, needs] - !reference [.with-jest-build-cache-vue3-needs, needs]
jest-with-fixtures vue3: jest-with-fixtures vue3:
...@@ -327,6 +329,8 @@ jest-with-fixtures vue3: ...@@ -327,6 +329,8 @@ jest-with-fixtures vue3:
- .vue3 - .vue3
needs: needs:
- !reference ["jest vue3", needs] - !reference ["jest vue3", needs]
# it's ok to wait for the repo artifact as we're waiting for the fixtures (which wait for the repo artifact) anyway
- !reference [.repo-from-artifacts, needs]
- !reference [.with-fixtures-needs, needs] - !reference [.with-fixtures-needs, needs]
jest predictive: jest predictive:
...@@ -352,20 +356,24 @@ jest-with-fixtures predictive: ...@@ -352,20 +356,24 @@ jest-with-fixtures predictive:
jest-integration: jest-integration:
extends: extends:
- .frontend-test-base - .frontend-test-base
- .repo-from-artifacts
- .frontend:rules:jest-integration - .frontend:rules:jest-integration
script: script:
- run_timed_command "yarn jest:integration --ci" - run_timed_command "yarn jest:integration --ci"
needs: needs:
- !reference [.frontend-test-base, needs] # it's ok to wait for the repo artifact as we're waiting for the fixtures (which wait for the repo artifact) anyway
- !reference [.repo-from-artifacts, needs]
- !reference [.with-fixtures-needs, needs] - !reference [.with-fixtures-needs, needs]
- !reference [.with-graphql-schema-dump-needs, needs] - !reference [.with-graphql-schema-dump-needs, needs]
jest-snapshot-vue3: jest-snapshot-vue3:
extends: extends:
- .frontend-test-base - .frontend-test-base
- .repo-from-artifacts
- .frontend:rules:jest-snapshot-vue3 - .frontend:rules:jest-snapshot-vue3
needs: needs:
- !reference [.frontend-test-base, needs] # it's ok to wait for the repo artifact as we're waiting for the fixtures (which wait for the repo artifact) anyway
- !reference [.repo-from-artifacts, needs]
- !reference [.with-fixtures-needs, needs] - !reference [.with-fixtures-needs, needs]
variables: variables:
VUE_VERSION: 3 VUE_VERSION: 3
...@@ -456,9 +464,11 @@ compile-storybook: ...@@ -456,9 +464,11 @@ compile-storybook:
extends: extends:
- .frontend-test-base - .frontend-test-base
- .storybook-yarn-cache - .storybook-yarn-cache
- .repo-from-artifacts
- .frontend:rules:compile-storybook - .frontend:rules:compile-storybook
stage: pages stage: pages
needs: needs:
# it's ok to wait for the repo artifact as we're waiting for the fixtures (which wait for the repo artifact) anyway
- !reference [.repo-from-artifacts, needs] - !reference [.repo-from-artifacts, needs]
- !reference [.with-fixtures-needs, needs] - !reference [.with-fixtures-needs, needs]
- !reference [.with-graphql-schema-dump-needs, needs] - !reference [.with-graphql-schema-dump-needs, needs]
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册