Automatic merge of gitlab-org/gitlab-ce master

.gitlab-ci.yml

@@ -322,10 +322,16 @@ package-and-qa:
   <<: *single-script-job
   variables:
     <<: *single-script-job-variables
+    API_TOKEN: "${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}"
     SCRIPT_NAME: trigger-build
   retry: 0
   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"
     - ./$SCRIPT_NAME omnibus
   when: manual
   only:
@@ -751,7 +757,7 @@ gitlab:setup-mysql:
 
 # Frontend-related jobs
 gitlab:assets:compile:
-  <<: *dedicated-no-docs-and-no-qa-pull-cache-job
+  <<: *dedicated-no-docs-pull-cache-job
   image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-git-2.18-chrome-69.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1
   dependencies: []
   services:

scripts/review_apps/review-apps.sh

@@ -292,7 +292,7 @@ function get_job_id() {
     local job_id=$(curl --silent --show-error --header "PRIVATE-TOKEN: ${API_TOKEN}" "${url}" | jq "map(select(.name == \"${job_name}\")) | map(.id) | last")
     [[ "${job_id}" == "null" && "${page}" -lt "$max_page" ]] || break
 
-    ((page++))
+    let "page++"
   done
 
   if [[ "${job_id}" == "" ]]; then
@@ -334,7 +334,7 @@ function wait_for_job_to_be_done() {
     [[ "${job_status}" == "pending" || "${job_status}" == "running" ]] || break
 
     printf "."
-    ((elapsed_seconds+=$interval))
+    let "elapsed_seconds+=interval"
     sleep ${interval}
   done
 

scripts/trigger-build

@@ -68,7 +68,7 @@ module Trigger
 
     def base_variables
       {
-        'GITLAB_REF_SLUG' => ref_slug,
+        'GITLAB_REF_SLUG' => ENV['CI_COMMIT_REF_SLUG'],
         'TRIGGERED_USER' => ENV['TRIGGERED_USER'] || ENV['GITLAB_USER_NAME'],
         'TRIGGER_SOURCE' => ENV['CI_JOB_URL'],
         'TOP_UPSTREAM_SOURCE_PROJECT' => ENV['CI_PROJECT_PATH'],
@@ -77,12 +77,6 @@ module Trigger
       }
     end
 
-    def ref_slug
-      return 'master' if ENV['CI_COMMIT_REF_SLUG'] =~ %r{(\Aqa[/-]|-qa\z)}
-
-      ENV['CI_COMMIT_REF_SLUG']
-    end
-
     # Read version files from all components
     def version_file_variables
       Dir.glob("*_VERSION").each_with_object({}) do |version_file, params|