diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-14 12:08:14 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-14 12:08:14 +0000 |
| commit | 075c890053f626018ba680e4da21a93743acb244 (patch) | |
| tree | f7a417c83956d02522c6234070974e4e53f9cd34 /.gitlab | |
| parent | af60c8a79f77c8230292a133fb9d09dab5cd5cd3 (diff) | |
| download | gitlab-ce-075c890053f626018ba680e4da21a93743acb244.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 26 | ||||
| -rw-r--r-- | .gitlab/ci/global.gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 16 |
3 files changed, 0 insertions, 47 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 4d120de277a..cde023c149a 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -273,32 +273,6 @@ coverage-frontend: coverage_format: cobertura path: coverage-frontend/cobertura-coverage.xml -.qa-frontend-node: - extends: - - .default-retry - - .default-utils-before_script - - .qa-frontend-node-cache - - .frontend:rules:qa-frontend-node - stage: test - needs: [] - script: - - yarn_install_script - - run_timed_command "retry yarn run webpack-prod" - -qa-frontend-node:14: - extends: .qa-frontend-node - image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}node:14 - -qa-frontend-node:16: - extends: .qa-frontend-node - image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}node:16 - -qa-frontend-node:latest: - extends: - - .qa-frontend-node - - .frontend:rules:qa-frontend-node-latest - image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}node:latest - webpack-dev-server: extends: - .default-retry diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index 8d5a2bef9d6..5e35ae6aff3 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -201,11 +201,6 @@ cache: - *node-modules-cache -.qa-frontend-node-cache: - cache: - - *node-modules-cache - - *assets-tmp-cache - .assets-compile-cache: cache: - *ruby-gems-cache diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index e5132c03997..cee5aba8d4a 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -1030,22 +1030,6 @@ - <<: *if-default-branch-refs changes: *code-backstage-patterns -.frontend:rules:qa-frontend-node: - rules: - - <<: *if-default-branch-refs - changes: *frontend-dependency-patterns - - <<: *if-merge-request - changes: *frontend-dependency-patterns - -.frontend:rules:qa-frontend-node-latest: - rules: - - <<: *if-default-branch-refs - changes: *frontend-dependency-patterns - allow_failure: true - - <<: *if-merge-request - changes: *frontend-dependency-patterns - allow_failure: true - .frontend:rules:bundle-size-review: rules: - <<: *if-not-canonical-namespace |