From 34c0263b26004df5e551b4637e6eff18b3ae1a21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 3 Jul 2024 11:08:24 +0200
Subject: [PATCH] Move frontend test to new test-frontend stage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Rémy Coutable <remy@rymai.me>
---
.gitlab-ci.yml | 1 +
.gitlab/ci/frontend.gitlab-ci.yml | 28 ++-----------------
.../gitlab-com/danger-review.gitlab-ci.yml | 1 +
.gitlab/ci/preflight.gitlab-ci.yml | 18 ++++++++++++
.gitlab/ci/qa.gitlab-ci.yml | 1 +
.gitlab/ci/setup.gitlab-ci.yml | 2 +-
6 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bc305a18156b..0ef5d8305488 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,7 @@ stages:
- build-images
- fixtures
- lint
+ - test-frontend
- test
- post-test
- review
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml
index 2c644195222b..8db7912d589a 100644
--- a/.gitlab/ci/frontend.gitlab-ci.yml
+++ b/.gitlab/ci/frontend.gitlab-ci.yml
@@ -92,7 +92,6 @@ update-assets-compile-production-cache:
- .update-cache-base
- .assets-compile-cache-push
- .shared:rules:update-cache
- stage: prepare
artifacts: {} # This job's purpose is only to update the cache.
update-assets-compile-test-cache:
@@ -101,7 +100,6 @@ update-assets-compile-test-cache:
- .update-cache-base
- .assets-compile-cache-push
- .shared:rules:update-cache
- stage: prepare
artifacts: {} # This job's purpose is only to update the cache.
update-storybook-yarn-cache:
@@ -240,7 +238,7 @@ graphql-schema-dump:
before_script:
- !reference [.default-before_script, before_script]
- yarn_install_script
- stage: test
+ stage: test-frontend
jest-build-cache:
extends:
@@ -440,7 +438,7 @@ webpack-dev-server:
- .yarn-cache
- .repo-from-artifacts
- .frontend:rules:default-frontend-jobs
- stage: test
+ stage: test-frontend
variables:
WEBPACK_MEMORY_TEST: "true"
WEBPACK_VENDOR_DLL: "true"
@@ -454,32 +452,12 @@ webpack-dev-server:
paths:
- webpack-dev-server.json
-bundle-size-review:
- extends:
- - .default-retry
- - .default-utils-before_script
- - .assets-compile-cache
- - .repo-from-artifacts
- - .frontend:rules:bundle-size-review
- image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:danger
- stage: test
- needs:
- - !reference [.repo-from-artifacts, needs]
- script:
- - yarn_install_script
- - scripts/bundle_size_review
- artifacts:
- when: always
- name: bundle-size-review
- expire_in: 31d
- paths:
- - bundle-size-review/
-
compile-storybook:
extends:
- .frontend-test-base
- .storybook-yarn-cache
- .frontend:rules:compile-storybook
+ stage: pages
needs:
- !reference [.repo-from-artifacts, needs]
- !reference [.with-fixtures-needs, needs]
diff --git a/.gitlab/ci/includes/gitlab-com/danger-review.gitlab-ci.yml b/.gitlab/ci/includes/gitlab-com/danger-review.gitlab-ci.yml
index 6453936b6cbd..15d50bb88c90 100644
--- a/.gitlab/ci/includes/gitlab-com/danger-review.gitlab-ci.yml
+++ b/.gitlab/ci/includes/gitlab-com/danger-review.gitlab-ci.yml
@@ -2,6 +2,7 @@ include:
- component: ${CI_SERVER_FQDN}/gitlab-org/components/danger-review/danger-review@1.4.1
inputs:
job_image: "${DEFAULT_CI_IMAGE}"
+ job_stage: "preflight"
# By default DANGER_DANGERFILE_PREFIX is not defined but allows JiHu to
# use a different prefix.
# See https://jihulab.com/gitlab-cn/gitlab/-/blob/main-jh/jh/.gitlab-ci.yml
diff --git a/.gitlab/ci/preflight.gitlab-ci.yml b/.gitlab/ci/preflight.gitlab-ci.yml
index ad8c3047396a..e2132d3eeecb 100644
--- a/.gitlab/ci/preflight.gitlab-ci.yml
+++ b/.gitlab/ci/preflight.gitlab-ci.yml
@@ -115,3 +115,21 @@ pipeline-tier-3:
extends:
- .pipeline-tier-base
- .preflight:rules:pipeline-tier-3
+
+bundle-size-review:
+ extends:
+ - .default-retry
+ - .default-utils-before_script
+ - .assets-compile-cache
+ - .repo-from-artifacts
+ - .frontend:rules:bundle-size-review
+ stage: preflight
+ script:
+ - yarn_install_script
+ - scripts/bundle_size_review
+ artifacts:
+ when: always
+ name: bundle-size-review
+ expire_in: 31d
+ paths:
+ - bundle-size-review/
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index b525c0342ed9..214e35c6df7f 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -102,6 +102,7 @@ qa:metadata-lint:
extends:
- .qa-job-base
- .qa:rules:metadata-lint
+ stage: lint
variables:
QA_EXPORT_TEST_METRICS: "false"
# Disable warnings in browserslist which can break on backports
diff --git a/.gitlab/ci/setup.gitlab-ci.yml b/.gitlab/ci/setup.gitlab-ci.yml
index 0acec43ca31a..0ebe3c586193 100644
--- a/.gitlab/ci/setup.gitlab-ci.yml
+++ b/.gitlab/ci/setup.gitlab-ci.yml
@@ -91,7 +91,7 @@ verify-tests-yml:
extends:
- .setup:rules:verify-tests-yml
image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}ruby:${RUBY_VERSION}-alpine3.20
- stage: test
+ stage: preflight
needs: []
script:
- source scripts/utils.sh
--
GitLab