Merge branch 'rc/cleanup-some-jobs' into 'master'

Improve the build-package and .review-docs jobs

See merge request gitlab-org/gitlab-ce!14938
This commit is contained in:
Robert Speicher 2017-10-20 14:10:24 +00:00
commit 40ded704cc
1 changed files with 1 additions and 9 deletions

View File

@ -154,12 +154,8 @@ stages:
# Trigger a package build in omnibus-gitlab repository
build-package:
image: ruby:2.3-alpine
image: ruby:2.4-alpine
before_script: []
services: []
variables:
SETUP_DB: "false"
USE_BUNDLE_INSTALL: "false"
stage: build
cache: {}
when: manual
@ -180,13 +176,9 @@ build-package:
- apk add --update openssl
- wget https://gitlab.com/gitlab-org/gitlab-ce/raw/master/scripts/trigger-build-docs
- chmod 755 trigger-build-docs
services: []
cache: {}
dependencies: []
artifacts: {}
variables:
SETUP_DB: "false"
USE_BUNDLE_INSTALL: "false"
GIT_STRATEGY: none
when: manual
only: