Merge pull request #779 from bogdando/ci_triggers
Allow triggered gitlab CI builds
This commit is contained in:
commit
9a92fee4c6
1 changed files with 10 additions and 6 deletions
|
@ -141,6 +141,7 @@ coreos-calico-sep:
|
||||||
CLUSTER_MODE: separated
|
CLUSTER_MODE: separated
|
||||||
BOOTSTRAP_OS: coreos
|
BOOTSTRAP_OS: coreos
|
||||||
when: on_success
|
when: on_success
|
||||||
|
except: ['triggers']
|
||||||
only: [/^pr-.*$/]
|
only: [/^pr-.*$/]
|
||||||
|
|
||||||
debian8-canal-ha:
|
debian8-canal-ha:
|
||||||
|
@ -154,7 +155,7 @@ debian8-canal-ha:
|
||||||
CLOUD_REGION: us-east1-b
|
CLOUD_REGION: us-east1-b
|
||||||
CLUSTER_MODE: ha
|
CLUSTER_MODE: ha
|
||||||
when: manual
|
when: manual
|
||||||
only: ['master', /^pr-.*$/]
|
only: ['master', /^pr-.*$/, 'triggers']
|
||||||
|
|
||||||
rhel7-weave:
|
rhel7-weave:
|
||||||
stage: deploy-gce-part1
|
stage: deploy-gce-part1
|
||||||
|
@ -167,7 +168,7 @@ rhel7-weave:
|
||||||
CLOUD_REGION: europe-west1-b
|
CLOUD_REGION: europe-west1-b
|
||||||
CLUSTER_MODE: default
|
CLUSTER_MODE: default
|
||||||
when: manual
|
when: manual
|
||||||
only: ['master', /^pr-.*$/]
|
only: ['master', /^pr-.*$/, 'triggers']
|
||||||
|
|
||||||
centos7-flannel:
|
centos7-flannel:
|
||||||
stage: deploy-gce-part2
|
stage: deploy-gce-part2
|
||||||
|
@ -180,6 +181,7 @@ centos7-flannel:
|
||||||
CLOUD_REGION: us-west1-a
|
CLOUD_REGION: us-west1-a
|
||||||
CLUSTER_MODE: default
|
CLUSTER_MODE: default
|
||||||
when: on_success
|
when: on_success
|
||||||
|
except: ['triggers']
|
||||||
only: [/^pr-.*$/]
|
only: [/^pr-.*$/]
|
||||||
|
|
||||||
debian8-calico:
|
debian8-calico:
|
||||||
|
@ -193,7 +195,7 @@ debian8-calico:
|
||||||
CLOUD_REGION: us-central1-b
|
CLOUD_REGION: us-central1-b
|
||||||
CLUSTER_MODE: default
|
CLUSTER_MODE: default
|
||||||
when: manual
|
when: manual
|
||||||
only: ['master', /^pr-.*$/]
|
only: ['master', /^pr-.*$/, 'triggers']
|
||||||
|
|
||||||
coreos-canal:
|
coreos-canal:
|
||||||
stage: deploy-gce-part2
|
stage: deploy-gce-part2
|
||||||
|
@ -207,7 +209,7 @@ coreos-canal:
|
||||||
CLUSTER_MODE: default
|
CLUSTER_MODE: default
|
||||||
BOOTSTRAP_OS: coreos
|
BOOTSTRAP_OS: coreos
|
||||||
when: manual
|
when: manual
|
||||||
only: ['master', /^pr-.*$/]
|
only: ['master', /^pr-.*$/, 'triggers']
|
||||||
|
|
||||||
rhel7-canal-sep:
|
rhel7-canal-sep:
|
||||||
stage: deploy-gce-special
|
stage: deploy-gce-special
|
||||||
|
@ -220,7 +222,7 @@ rhel7-canal-sep:
|
||||||
CLOUD_REGION: us-east1-b
|
CLOUD_REGION: us-east1-b
|
||||||
CLUSTER_MODE: separated
|
CLUSTER_MODE: separated
|
||||||
when: manual
|
when: manual
|
||||||
only: ['master', /^pr-.*$/]
|
only: ['master', /^pr-.*$/, 'triggers']
|
||||||
|
|
||||||
ubuntu-weave-sep:
|
ubuntu-weave-sep:
|
||||||
stage: deploy-gce-special
|
stage: deploy-gce-special
|
||||||
|
@ -233,6 +235,7 @@ ubuntu-weave-sep:
|
||||||
CLOUD_REGION: us-central1-b
|
CLOUD_REGION: us-central1-b
|
||||||
CLUSTER_MODE: separated
|
CLUSTER_MODE: separated
|
||||||
when: on_success
|
when: on_success
|
||||||
|
except: ['triggers']
|
||||||
only: [/^pr-.*$/]
|
only: [/^pr-.*$/]
|
||||||
|
|
||||||
centos7-calico-ha:
|
centos7-calico-ha:
|
||||||
|
@ -246,10 +249,11 @@ centos7-calico-ha:
|
||||||
CLOUD_REGION: europe-west1-b
|
CLOUD_REGION: europe-west1-b
|
||||||
CLUSTER_MODE: ha
|
CLUSTER_MODE: ha
|
||||||
when: manual
|
when: manual
|
||||||
only: ['master', /^pr-.*$/]
|
only: ['master', /^pr-.*$/, 'triggers']
|
||||||
|
|
||||||
syntax-check:
|
syntax-check:
|
||||||
<<: *job
|
<<: *job
|
||||||
stage: unit-tests
|
stage: unit-tests
|
||||||
script:
|
script:
|
||||||
- ansible-playbook -i inventory/local-tests.cfg -u root -e ansible_ssh_user=root -b --become-user=root cluster.yml -vvv --syntax-check
|
- ansible-playbook -i inventory/local-tests.cfg -u root -e ansible_ssh_user=root -b --become-user=root cluster.yml -vvv --syntax-check
|
||||||
|
except: ['triggers']
|
||||||
|
|
Loading…
Reference in a new issue