diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml index ca1da70fc9306a99a0d4ceac7baaf3f87a33c7f5..0c15181096994023d6c64f66e2f31fdd68e2498c 100644 --- a/.gitlab-ci/packet.yml +++ b/.gitlab-ci/packet.yml @@ -22,15 +22,15 @@ packet_ubuntu20-calico-aio: # ### PR JOBS PART2 -packet_centos7-flannel-addons: +packet_centos7-flannel-containerd-addons-ha: extends: .packet stage: deploy-part2 when: on_success # ### MANUAL JOBS -packet_centos7-weave-kubeadm-sep: - stage: deploy-part2 +packet_centos7-weave-upgrade-ha: + stage: deploy-part3 extends: .packet when: on_success variables: @@ -43,12 +43,12 @@ packet_ubuntu16-weave-sep: # # More builds for PRs/merges (manual) and triggers (auto) -packet_ubuntu16-canal-ha: +packet_ubuntu16-canal-sep: stage: deploy-special extends: .packet when: manual -packet_ubuntu16-canal-kubeadm: +packet_ubuntu16-canal-kubeadm-ha: stage: deploy-part2 extends: .packet when: on_success @@ -69,23 +69,23 @@ packet_ubuntu18-cilium-sep: extends: .packet when: manual -packet_ubuntu18-flannel-containerd: +packet_ubuntu18-flannel-containerd-ha: stage: deploy-part2 extends: .packet when: manual -packet_ubuntu18-flannel-containerd-once: +packet_ubuntu18-flannel-containerd-ha-once: stage: deploy-part2 extends: .packet when: manual -packet_debian9-macvlan-sep: +packet_debian9-macvlan: stage: deploy-part2 extends: .packet when: manual packet_debian9-calico-upgrade-once: - stage: deploy-part2 + stage: deploy-part3 extends: .packet when: on_success variables: @@ -133,7 +133,7 @@ packet_opensuse-canal: extends: .packet when: on_success -packet_oracle7-canal: +packet_oracle7-canal-ha: stage: deploy-part2 extends: .packet when: manual diff --git a/.gitlab-ci/terraform.yml b/.gitlab-ci/terraform.yml index 857b114c7e77ecd4722a328bd0017b7ba74ca4c3..44bea0c2e2d95fa4fb563795a639f6a51420cf4d 100644 --- a/.gitlab-ci/terraform.yml +++ b/.gitlab-ci/terraform.yml @@ -31,7 +31,7 @@ .terraform_apply: extends: .terraform_install tags: [light] - stage: deploy-part2 + stage: deploy-part3 when: manual only: [/^pr-.*$/] artifacts: diff --git a/tests/files/packet_centos7-flannel-addons.yml b/tests/files/packet_centos7-flannel-containerd-addons-ha.yml similarity index 100% rename from tests/files/packet_centos7-flannel-addons.yml rename to tests/files/packet_centos7-flannel-containerd-addons-ha.yml diff --git a/tests/files/packet_centos7-weave-kubeadm-sep.yml b/tests/files/packet_centos7-weave-upgrade-ha.yml similarity index 100% rename from tests/files/packet_centos7-weave-kubeadm-sep.yml rename to tests/files/packet_centos7-weave-upgrade-ha.yml diff --git a/tests/files/packet_debian9-macvlan-sep.yml b/tests/files/packet_debian9-macvlan.yml similarity index 100% rename from tests/files/packet_debian9-macvlan-sep.yml rename to tests/files/packet_debian9-macvlan.yml diff --git a/tests/files/packet_oracle7-canal.yml b/tests/files/packet_oracle7-canal-ha.yml similarity index 100% rename from tests/files/packet_oracle7-canal.yml rename to tests/files/packet_oracle7-canal-ha.yml diff --git a/tests/files/packet_ubuntu16-canal-kubeadm.yml b/tests/files/packet_ubuntu16-canal-kubeadm-ha.yml similarity index 100% rename from tests/files/packet_ubuntu16-canal-kubeadm.yml rename to tests/files/packet_ubuntu16-canal-kubeadm-ha.yml diff --git a/tests/files/packet_ubuntu16-canal-ha.yml b/tests/files/packet_ubuntu16-canal-sep.yml similarity index 100% rename from tests/files/packet_ubuntu16-canal-ha.yml rename to tests/files/packet_ubuntu16-canal-sep.yml diff --git a/tests/files/packet_ubuntu18-flannel-containerd-once.yml b/tests/files/packet_ubuntu18-flannel-containerd-ha-once.yml similarity index 100% rename from tests/files/packet_ubuntu18-flannel-containerd-once.yml rename to tests/files/packet_ubuntu18-flannel-containerd-ha-once.yml diff --git a/tests/files/packet_ubuntu18-flannel-containerd.yml b/tests/files/packet_ubuntu18-flannel-containerd-ha.yml similarity index 100% rename from tests/files/packet_ubuntu18-flannel-containerd.yml rename to tests/files/packet_ubuntu18-flannel-containerd-ha.yml