run everything

kubernetes-sigs · Jul 5, 2021 · c31880d · c31880d
1 parent 4a15994
commit c31880d
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 101 deletions.
diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
@@ -13,15 +13,6 @@
   only: [/^pr-.*$/]
   extends: .packet
 
-# CI template for periodic CI jobs
-# Enabled when PERIODIC_CI_ENABLED var is set
-.packet_periodic:
-  only:
-    variables:
-      - $PERIODIC_CI_ENABLED
-  allow_failure: true
-  extends: .packet
-
 packet_ubuntu18-calico-aio:
   stage: deploy-part1
   extends: .packet_pr
@@ -37,62 +28,62 @@ packet_ubuntu20-calico-aio:
 
 packet_centos7-flannel-containerd-addons-ha:
   extends: .packet_pr
-  stage: deploy-part2
+  stage: deploy-part1
   when: on_success
   variables:
     MITOGEN_ENABLE: "true"
 
 packet_centos8-crio:
   extends: .packet_pr
-  stage: deploy-part2
+  stage: deploy-part1
   when: on_success
 
 packet_ubuntu18-crio:
   extends: .packet_pr
-  stage: deploy-part2
-  when: manual
+  stage: unit-tests
+  when: on_success
   variables:
     MITOGEN_ENABLE: "true"
 
 packet_ubuntu16-canal-kubeadm-ha:
-  stage: deploy-part2
-  extends: .packet_periodic
+  stage: deploy-part1
+  extends: .packet_pr
   when: on_success
 
 packet_ubuntu16-canal-sep:
-  stage: deploy-special
+  stage: deploy-part1
   extends: .packet_pr
-  when: manual
+  when: on_success
 
 packet_ubuntu16-flannel-ha:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .packet_pr
-  when: manual
+  when: on_success
 
 packet_ubuntu16-kube-router-sep:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .packet_pr
-  when: manual
+  when: on_success
 
 packet_ubuntu16-kube-router-svc-proxy:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .packet_pr
-  when: manual
+  when: on_success
 
 packet_debian10-cilium-svc-proxy:
-  stage: deploy-part2
-  extends: .packet_periodic
+  stage: deploy-part1
+  extends: .packet_pr
   when: on_success
 
 packet_debian10-containerd:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .packet_pr
   when: on_success
   variables:
     MITOGEN_ENABLE: "true"
 
 packet_centos7-calico-ha-once-localhost:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .packet_pr
   when: on_success
   variables:
@@ -102,140 +93,140 @@ packet_centos7-calico-ha-once-localhost:
     - docker:19.03.9-dind
 
 packet_centos8-kube-ovn:
-  stage: deploy-part2
-  extends: .packet_periodic
+  stage: deploy-part1
+  extends: .packet_pr
   when: on_success
 
 packet_centos8-calico:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .packet_pr
   when: on_success
 
 packet_fedora34-weave:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .packet_pr
   when: on_success
 
 packet_opensuse-canal:
-  stage: deploy-part2
-  extends: .packet_periodic
+  stage: deploy-part1
+  extends: .packet_pr
   when: on_success
 
 packet_ubuntu18-ovn4nfv:
-  stage: deploy-part2
-  extends: .packet_periodic
+  stage: deploy-part1
+  extends: .packet_pr
   when: on_success
 
 # ### MANUAL JOBS
 
 packet_ubuntu16-weave-sep:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .packet_pr
-  when: manual
+  when: on_success
 
 packet_ubuntu18-cilium-sep:
-  stage: deploy-special
+  stage: deploy-part1
   extends: .packet_pr
-  when: manual
+  when: on_success
 
 packet_ubuntu18-flannel-containerd-ha:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .packet_pr
-  when: manual
+  when: on_success
 
 packet_ubuntu18-flannel-containerd-ha-once:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .packet_pr
-  when: manual
+  when: on_success
 
 packet_debian9-macvlan:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .packet_pr
-  when: manual
+  when: on_success
 
 packet_centos7-calico-ha:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .packet_pr
-  when: manual
+  when: on_success
 
 packet_centos7-kube-router:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .packet_pr
-  when: manual
+  when: on_success
 
 packet_centos7-multus-calico:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .packet_pr
-  when: manual
+  when: on_success
 
 packet_oracle7-canal-ha:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .packet_pr
-  when: manual
+  when: on_success
 
 packet_fedora33-calico:
-  stage: deploy-part2
-  extends: .packet_periodic
+  stage: deploy-part1
+  extends: .packet_pr
   when: on_success
   variables:
     MITOGEN_ENABLE: "true"
 
 packet_amazon-linux-2-aio:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .packet_pr
-  when: manual
+  when: on_success
 
 packet_fedora34-kube-ovn-containerd:
-  stage: deploy-part2
-  extends: .packet_periodic
+  stage: deploy-part1
+  extends: .packet_pr
   when: on_success
 
 # ### PR JOBS PART3
 # Long jobs (45min+)
 
 packet_centos7-weave-upgrade-ha:
-  stage: deploy-part3
-  extends: .packet_periodic
+  stage: deploy-part1
+  extends: .packet_pr
   when: on_success
   variables:
     UPGRADE_TEST: basic
     MITOGEN_ENABLE: "false"
 
 # Calico HA Wireguard
 packet_ubuntu20-calico-ha-wireguard:
-  stage: deploy-part2
+  stage: unit-tests
   extends: .packet_pr
-  when: manual
+  when: on_success
   variables:
     MITOGEN_ENABLE: "true"
 
 packet_debian9-calico-upgrade:
-  stage: deploy-part3
+  stage: deploy-part1
   extends: .packet_pr
   when: on_success
   variables:
     UPGRADE_TEST: graceful
     MITOGEN_ENABLE: "false"
 
 packet_debian9-calico-upgrade-once:
-  stage: deploy-part3
-  extends: .packet_periodic
+  stage: deploy-part1
+  extends: .packet_pr
   when: on_success
   variables:
     UPGRADE_TEST: graceful
     MITOGEN_ENABLE: "false"
 
 packet_ubuntu18-calico-ha-recover:
-  stage: deploy-part3
-  extends: .packet_periodic
+  stage: deploy-part1
+  extends: .packet_pr
   when: on_success
   variables:
     RECOVER_CONTROL_PLANE_TEST: "true"
     RECOVER_CONTROL_PLANE_TEST_GROUPS: "etcd[2:],kube_control_plane[1:]"
 
 packet_ubuntu18-calico-ha-recover-noquorum:
-  stage: deploy-part3
-  extends: .packet_periodic
+  stage: deploy-part1
+  extends: .packet_pr
   when: on_success
   variables:
     RECOVER_CONTROL_PLANE_TEST: "true"

diff --git a/.gitlab-ci/vagrant.yml b/.gitlab-ci/vagrant.yml
@@ -1,20 +1,5 @@
 ---
 
-molecule_tests:
-  tags: [c3.small.x86]
-  only: [/^pr-.*$/]
-  except: ['triggers']
-  image: quay.io/kubespray/vagrant:$KUBESPRAY_VERSION
-  services: []
-  stage: deploy-part1
-  before_script:
-    - tests/scripts/rebase.sh
-    - apt-get update && apt-get install -y python3-pip
-    - update-alternatives --install /usr/bin/python python /usr/bin/python3 10
-    - python -m pip install -r tests/requirements.txt
-    - ./tests/scripts/vagrant_clean.sh
-  script:
-    - ./tests/scripts/molecule_run.sh
 
 .vagrant:
   extends: .testcases
@@ -39,21 +24,21 @@ molecule_tests:
     - chronic ./tests/scripts/testcases_cleanup.sh
 
 vagrant_ubuntu18-calico-dual-stack:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .vagrant
   when: on_success
 
 vagrant_ubuntu18-flannel:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .vagrant
   when: on_success
 
 vagrant_ubuntu18-weave-medium:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .vagrant
-  when: manual
+  when: on_success
 
 vagrant_ubuntu20-flannel:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .vagrant
   when: on_success