Automatic merge of gitlab-org/gitlab-ce master

.gitlab-ci.yml

@@ -1115,6 +1115,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
@@ -1129,15 +1143,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
@@ -1148,7 +1161,6 @@ review-deploy:
 
 .review-qa-base: &review-qa-base
   <<: *review-docker
-  retry: 2
   allow_failure: true
   variables:
     <<: *review-docker-variables