Commit ee7e9c96 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch '347317-re-enable-review-apps-on-2-hour-scheduled-pipelines' into 'master'

ci: Re-enable Review Apps on scheduled pipelines

See merge request gitlab-org/gitlab!76243
parents 2d4415e1 e721d105
...@@ -5,7 +5,7 @@ review-cleanup: ...@@ -5,7 +5,7 @@ review-cleanup:
image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-helm3-kubectl1.14 image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-helm3-kubectl1.14
stage: prepare stage: prepare
environment: environment:
name: review/auto-cleanup name: review/${CI_COMMIT_REF_SLUG}${FREQUENCY}
action: stop action: stop
before_script: before_script:
- source scripts/utils.sh - source scripts/utils.sh
...@@ -13,6 +13,8 @@ review-cleanup: ...@@ -13,6 +13,8 @@ review-cleanup:
- install_gitlab_gem - install_gitlab_gem
- setup_gcp_dependencies - setup_gcp_dependencies
script: script:
- delete_release
- delete_k8s_release_namespace
- ruby -rrubygems scripts/review_apps/automated_cleanup.rb - ruby -rrubygems scripts/review_apps/automated_cleanup.rb
- gcp_cleanup - gcp_cleanup
......
...@@ -1623,6 +1623,9 @@ ...@@ -1623,6 +1623,9 @@
allow_failure: true allow_failure: true
- <<: *if-dot-com-gitlab-org-merge-request - <<: *if-dot-com-gitlab-org-merge-request
changes: *qa-patterns changes: *qa-patterns
- <<: *if-dot-com-gitlab-org-schedule
variables:
KNAPSACK_GENERATE_REPORT: "true"
.review:rules:review-build-cng: .review:rules:review-build-cng:
rules: rules:
...@@ -1662,10 +1665,6 @@ ...@@ -1662,10 +1665,6 @@
.review:rules:review-qa-reliable: .review:rules:review-qa-reliable:
rules: rules:
- <<: *if-dot-com-ee-2-hourly-schedule
allow_failure: true
variables:
KNAPSACK_GENERATE_REPORT: "true"
- when: on_success - when: on_success
allow_failure: true allow_failure: true
...@@ -1676,10 +1675,6 @@ ...@@ -1676,10 +1675,6 @@
changes: *code-patterns changes: *code-patterns
when: manual when: manual
allow_failure: true # manual jobs needs to be allowd to fail, otherwise they block the pipeline allow_failure: true # manual jobs needs to be allowd to fail, otherwise they block the pipeline
- <<: *if-dot-com-ee-2-hourly-schedule
allow_failure: true
variables:
KNAPSACK_GENERATE_REPORT: "true"
- when: on_success - when: on_success
allow_failure: true allow_failure: true
...@@ -1699,13 +1694,13 @@ ...@@ -1699,13 +1694,13 @@
# Reliable suite will pass most of the time so this should yield best distribution # Reliable suite will pass most of the time so this should yield best distribution
.review:rules:knapsack-report-qa-reliable: .review:rules:knapsack-report-qa-reliable:
rules: rules:
- <<: *if-dot-com-ee-2-hourly-schedule - if: '$KNAPSACK_GENERATE_REPORT == "true"'
when: on_success when: on_success
allow_failure: true allow_failure: true
.review:rules:knapsack-report-qa-all: .review:rules:knapsack-report-qa-all:
rules: rules:
- <<: *if-dot-com-ee-2-hourly-schedule - if: '$KNAPSACK_GENERATE_REPORT == "true"'
when: always when: always
allow_failure: true allow_failure: true
......
...@@ -15,6 +15,7 @@ For any of the following scenarios, the `start-review-app-pipeline` job would be ...@@ -15,6 +15,7 @@ For any of the following scenarios, the `start-review-app-pipeline` job would be
- for merge requests with CI config changes - for merge requests with CI config changes
- for merge requests with frontend changes - for merge requests with frontend changes
- for merge requests with QA changes - for merge requests with QA changes
- for scheduled pipelines
- the MR has the `pipeline:run-review-app` label set - the MR has the `pipeline:run-review-app` label set
## QA runs on Review Apps ## QA runs on Review Apps
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment