summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-01-21 19:25:53 +0100
committerRémy Coutable <remy@rymai.me>2019-01-21 19:58:58 +0100
commit988cddae4b646b104da7bd8e0a36b3a8950d2a62 (patch)
tree02778f2706f7f65410ee5f299804ce7b4e57aa77 /.gitlab-ci.yml
parentdc65a77992f7e965fa4cd843a21eaa59b7a7e6c1 (diff)
downloadgitlab-ce-988cddae4b646b104da7bd8e0a36b3a8950d2a62.tar.gz
Move the CNG triggering to a new review-build-cng job
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml24
1 files changed, 18 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 68dea56a67d..383300a895f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -947,6 +947,20 @@ no_ee_check:
- //@gitlab-org/gitlab-ce
# GitLab Review apps
+review-build-cng:
+ <<: *single-script-job
+ variables:
+ <<: *single-script-job-variables
+ SCRIPT_NAME: trigger-build
+ script:
+ - gem install gitlab --no-document
+ - apk add --update openssl curl jq
+ - wget $CI_PROJECT_URL/raw/$CI_COMMIT_SHA/scripts/review_apps/review-apps.sh
+ - chmod 755 review-apps.sh
+ - source ./review-apps.sh
+ - wait_for_job_to_be_done "gitlab:assets:compile"
+ - BUILD_TRIGGER_TOKEN=$REVIEW_APPS_BUILD_TRIGGER_TOKEN ./$SCRIPT_NAME cng
+
review-deploy:
<<: *review-base
retry: 2
@@ -961,15 +975,14 @@ review-deploy:
<<: *review-environment
on_stop: review-stop
before_script:
- - apk update && apk add jq
- - gem install gitlab --no-document
- script:
- export GITLAB_SHELL_VERSION=$(<GITLAB_SHELL_VERSION)
- export GITALY_VERSION=$(<GITALY_SERVER_VERSION)
- export GITLAB_WORKHORSE_VERSION=$(<GITLAB_WORKHORSE_VERSION)
+ - apk update && apk add jq
+ - gem install gitlab --no-document
- source ./scripts/review_apps/review-apps.sh
- - wait_for_job_to_be_done "gitlab:assets:compile"
- - BUILD_TRIGGER_TOKEN=$REVIEW_APPS_BUILD_TRIGGER_TOKEN ./scripts/trigger-build cng
+ script:
+ - wait_for_job_to_be_done "review-build-cng"
- check_kube_domain
- download_gitlab_chart
- ensure_namespace
@@ -980,7 +993,6 @@ review-deploy:
.review-qa-base: &review-qa-base
<<: *review-docker
- retry: 2
allow_failure: true
variables:
<<: *review-docker-variables