vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2805 from coreos-inc/fix_preview_env_master

Browse source 
Fix master ci-pipeline
This commit is contained in:
Antoine Legrand 2017-07-20 17:59:39 +02:00 committed by GitHub
commit 2046a882c5
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitlab-ci.jsonnet
View file

@ -26,6 +26,7 @@ local jobs = {
}, },
local onlyBranch = { local onlyBranch = {
only: ['branches'], only: ['branches'],
except: ['master']
}, },
'container-base-build': baseJob.dockerBuild + onlyMaster { 'container-base-build': baseJob.dockerBuild + onlyMaster {

4
.gitlab-ci.yml
View file

@ -58,6 +58,8 @@ deploy-preview:
name: review/${CI_COMMIT_REF_SLUG} name: review/${CI_COMMIT_REF_SLUG}
on_stop: stop-preview on_stop: stop-preview
url: https://quay-${CI_COMMIT_REF_SLUG}.k8s.devtable.com url: https://quay-${CI_COMMIT_REF_SLUG}.k8s.devtable.com
except:
- master
image: quay.io/appr/appr:kubectl image: quay.io/appr/appr:kubectl
only: only:
- branches - branches
@ -195,6 +197,8 @@ stop-preview:
action: stop action: stop
name: review/${CI_COMMIT_REF_SLUG} name: review/${CI_COMMIT_REF_SLUG}
url: https://quay-${CI_COMMIT_REF_SLUG}.k8s.devtable.com url: https://quay-${CI_COMMIT_REF_SLUG}.k8s.devtable.com
except:
- master
image: quay.io/appr/appr:kubectl image: quay.io/appr/appr:kubectl
only: only:
- branches - branches