diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-16 12:10:54 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-16 12:10:54 +0000 |
| commit | f01d3c8c095e70981ffc1d20c050c153f3766421 (patch) | |
| tree | 1f072a51c12791df3847fd90bd8e6a369631e990 /.gitlab/ci | |
| parent | cb20cd86e45ad06b0dc43562c0a1121c3e505c36 (diff) | |
| download | gitlab-ce-f01d3c8c095e70981ffc1d20c050c153f3766421.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci')
| -rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 20 | ||||
| -rw-r--r-- | .gitlab/ci/package-and-test/main.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 1 |
3 files changed, 21 insertions, 2 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 59758d2aec7..c5d992cab63 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -49,6 +49,18 @@ compile-production-assets: after_script: - rm -f /etc/apt/sources.list.d/google*.list # We don't need to update Chrome here +compile-production-assets-esbuild: + allow_failure: true + extends: + - .compile-assets-base + - .frontend:rules:compile-production-assets + variables: + NODE_ENV: "production" + RAILS_ENV: "production" + WEBPACK_USE_ESBUILD_LOADER: "true" + after_script: + - rm -f /etc/apt/sources.list.d/google*.list # We don't need to update Chrome here + compile-test-assets: extends: - .compile-assets-base @@ -61,6 +73,14 @@ compile-test-assets: - "${WEBPACK_COMPILE_LOG_PATH}" when: always +compile-test-assets-esbuild: + allow_failure: true + extends: + - .compile-assets-base + - .frontend:rules:compile-test-assets + variables: + WEBPACK_USE_ESBUILD_LOADER: "true" + compile-test-assets as-if-foss: extends: - compile-test-assets diff --git a/.gitlab/ci/package-and-test/main.gitlab-ci.yml b/.gitlab/ci/package-and-test/main.gitlab-ci.yml index 3275b63d742..99aa62a1bca 100644 --- a/.gitlab/ci/package-and-test/main.gitlab-ci.yml +++ b/.gitlab/ci/package-and-test/main.gitlab-ci.yml @@ -648,10 +648,10 @@ e2e-test-report: - .rules:report:allure-report stage: report variables: + ALLURE_JOB_NAME: e2e-package-and-test GITLAB_AUTH_TOKEN: $PROJECT_TOKEN_FOR_CI_SCRIPTS_API_USAGE ALLURE_PROJECT_PATH: $CI_PROJECT_PATH ALLURE_MERGE_REQUEST_IID: $CI_MERGE_REQUEST_IID - GIT_STRATEGY: none # Temporary separate test report for super-sidebar test job # TODO: remove once super-sidebar is on by default and enabled in tests diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index 97f8820a511..d935fecba01 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -69,7 +69,6 @@ e2e:package-and-test-ee: GITLAB_QA_IMAGE: "${CI_REGISTRY_IMAGE}/gitlab-ee-qa:${CI_COMMIT_SHA}" RUN_WITH_BUNDLE: "true" # instructs pipeline to install and run gitlab-qa gem via bundler QA_PATH: qa # sets the optional path for bundler to run from - ALLURE_JOB_NAME: e2e-package-and-test QA_RUN_TYPE: e2e-package-and-test inherit: variables: |