diff options
| author | Mark Lapierre <mlapierre@gitlab.com> | 2018-12-17 13:22:09 -0500 |
|---|---|---|
| committer | Mark Lapierre <mlapierre@gitlab.com> | 2018-12-17 15:30:52 -0500 |
| commit | 0f751f6f17d1f457276f15632b31203f658ec4c9 (patch) | |
| tree | 29e0b9eb4f41d07ecc8f5d09116a9be900605d58 /.gitlab-ci.yml | |
| parent | 4a10c813e726d09216c534bb0ad0ae50a0400259 (diff) | |
| download | gitlab-ce-0f751f6f17d1f457276f15632b31203f658ec4c9.tar.gz | |
Run gitlab:assets:compile on qa jobs
Optionally compiling assets when needed for qa jobs proved
unworkable so instead we fall back on compiling them for
all qa jobs.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c3d18d21be..3d12f4142ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -231,10 +231,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: @@ -600,7 +606,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: |