diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e464c4450..72d83d584 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -202,7 +202,7 @@ before_script: CLUSTER_MODE: ha BOOTSTRAP_OS: coreos -# Builds for PRs only (auto) +# Builds for PRs only (auto) and triggers (auto) coreos-calico-sep: stage: deploy-gce-part1 <<: *job @@ -214,6 +214,16 @@ coreos-calico-sep: except: ['triggers'] only: [/^pr-.*$/] +coreos-calico-sep-triggers: + stage: deploy-gce-part1 + <<: *job + <<: *gce + variables: + <<: *gce_variables + <<: *coreos_calico_sep_variables + when: on_success + only: ['triggers'] + centos7-flannel: stage: deploy-gce-part2 <<: *job @@ -225,6 +235,16 @@ centos7-flannel: except: ['triggers'] only: [/^pr-.*$/] +centos7-flannel-triggers: + stage: deploy-gce-part1 + <<: *job + <<: *gce + variables: + <<: *gce_variables + <<: *centos7_flannel_variables + when: on_success + only: ['triggers'] + ubuntu-weave-sep: stage: deploy-gce-special <<: *job @@ -236,6 +256,16 @@ ubuntu-weave-sep: except: ['triggers'] only: [/^pr-.*$/] +ubuntu-weave-sep-triggers: + stage: deploy-gce-part1 + <<: *job + <<: *gce + variables: + <<: *gce_variables + <<: *ubuntu_weave_sep_variables + when: on_success + only: ['triggers'] + # More builds for PRs/merges (manual) and triggers (auto) debian8-canal-ha: stage: deploy-gce-part1 @@ -291,7 +321,7 @@ debian8-calico: only: ['master', /^pr-.*$/] debian8-calico-triggers: - stage: deploy-gce-part2 + stage: deploy-gce-part1 <<: *job <<: *gce variables: @@ -312,7 +342,7 @@ coreos-canal: only: ['master', /^pr-.*$/] coreos-canal-triggers: - stage: deploy-gce-part2 + stage: deploy-gce-part1 <<: *job <<: *gce variables: @@ -333,7 +363,7 @@ rhel7-canal-sep: only: ['master', /^pr-.*$/,] rhel7-canal-sep-triggers: - stage: deploy-gce-special + stage: deploy-gce-part1 <<: *job <<: *gce variables: @@ -354,7 +384,7 @@ centos7-calico-ha: only: ['master', /^pr-.*$/] centos7-calico-ha-triggers: - stage: deploy-gce-special + stage: deploy-gce-part1 <<: *job <<: *gce variables: diff --git a/tests/cloud_playbooks/create-gce.yml b/tests/cloud_playbooks/create-gce.yml index f5a0be573..9ad0deb04 100644 --- a/tests/cloud_playbooks/create-gce.yml +++ b/tests/cloud_playbooks/create-gce.yml @@ -3,7 +3,7 @@ become: false gather_facts: no vars: - cloud_machine_type: n1-standard-1 + cloud_machine_type: g1-small mode: default tasks: diff --git a/tests/cloud_playbooks/delete-gce.yml b/tests/cloud_playbooks/delete-gce.yml index 5f9676b36..ee0ffad18 100644 --- a/tests/cloud_playbooks/delete-gce.yml +++ b/tests/cloud_playbooks/delete-gce.yml @@ -3,7 +3,6 @@ become: false gather_facts: no vars: - cloud_machine_type: f1-micro mode: default tasks: @@ -22,8 +21,6 @@ - name: delete gce instances gce: instance_names: "{{instance_names}}" - machine_type: "{{ cloud_machine_type }}" - preemptible: yes image: "{{ cloud_image }}" service_account_email: "{{ gce_service_account_email }}" pem_file: "{{ gce_pem_file | default(omit)}}"