diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-14 03:09:01 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-14 03:09:01 +0000 |
| commit | c60a1173018e93e6bf433f87cb726adc979d1c8a (patch) | |
| tree | 5231ab640b6b4914e4aee123dd2030a005216303 /lib | |
| parent | e144369009f3404072f7e0f969f7cded93195a01 (diff) | |
| download | gitlab-ce-c60a1173018e93e6bf433f87cb726adc979d1c8a.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml index a0ddd273552..a8e6d263666 100644 --- a/lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml @@ -15,9 +15,7 @@ test: - export DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DB_HOST}:5432/${POSTGRES_DB}" - cp -R . /tmp/app - /bin/herokuish buildpack test - only: - - branches - - tags - except: - variables: - - $TEST_DISABLED + rules: + - if: '$TEST_DISABLED' + when: never + - if: '$CI_COMMIT_TAG || $CI_COMMIT_BRANCH' |