Prepare v2.13 release

kubernetes-sigs · May 1, 2020 · ff70d4b · ff70d4b
1 parent 0512c22
commit ff70d4b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
@@ -39,7 +39,7 @@ packet_ubuntu18-crio:
 # ### MANUAL JOBS
 
 packet_centos7-weave-upgrade-ha:
-  stage: deploy-part3
+  stage: deploy-part2
   extends: .packet
   when: on_success
   variables:
@@ -49,24 +49,24 @@ packet_centos7-weave-upgrade-ha:
 packet_ubuntu16-weave-sep:
   stage: deploy-part2
   extends: .packet
-  when: manual
+  when: on_success
 
 # # More builds for PRs/merges (manual) and triggers (auto)
 
 packet_ubuntu16-canal-sep:
   stage: deploy-special
   extends: .packet
-  when: manual
+  when: on_success
 
 packet_ubuntu16-canal-kubeadm-ha:
   stage: deploy-part2
   extends: .packet
   when: on_success
 
 packet_ubuntu16-flannel-ha:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .packet
-  when: manual
+  when: on_success
 
 # Contiv does not work in k8s v1.16
 # packet_ubuntu16-contiv-sep:
@@ -75,27 +75,27 @@ packet_ubuntu16-flannel-ha:
 #   when: on_success
 
 packet_ubuntu18-cilium-sep:
-  stage: deploy-special
+  stage: deploy-part1
   extends: .packet
-  when: manual
+  when: on_success
 
 packet_ubuntu18-flannel-containerd-ha:
-  stage: deploy-part2
+  stage: unit-tests
   extends: .packet
-  when: manual
+  when: on_success
 
 packet_ubuntu18-flannel-containerd-ha-once:
   stage: deploy-part2
   extends: .packet
-  when: manual
+  when: on_success
 
 packet_debian9-macvlan:
   stage: deploy-part2
   extends: .packet
-  when: manual
+  when: on_success
 
 packet_debian9-calico-upgrade-once:
-  stage: deploy-part3
+  stage: deploy-part2
   extends: .packet
   when: on_success
   variables:
@@ -112,7 +112,7 @@ packet_debian10-containerd:
 packet_centos7-calico-ha:
   stage: deploy-part2
   extends: .packet
-  when: manual
+  when: on_success
 
 packet_centos7-calico-ha-once-localhost:
   stage: deploy-part2
@@ -139,61 +139,61 @@ packet_fedora31-flannel:
     MITOGEN_ENABLE: "true"
 
 packet_centos7-kube-router:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .packet
-  when: manual
+  when: on_success
 
 packet_centos7-multus-calico:
   stage: deploy-part2
   extends: .packet
-  when: manual
+  when: on_success
 
 packet_centos8-calico:
   stage: deploy-part2
   extends: .packet
   when: on_success
 
 packet_opensuse-canal:
-  stage: deploy-part2
+  stage: deploy-part1
   extends: .packet
   when: on_success
 
 packet_oracle7-canal-ha:
   stage: deploy-part2
   extends: .packet
-  when: manual
+  when: on_success
 
 packet_ubuntu16-kube-router-sep:
   stage: deploy-part2
   extends: .packet
-  when: manual
+  when: on_success
 
 packet_amazon-linux-2-aio:
   stage: deploy-part2
   extends: .packet
-  when: manual
+  when: on_success
 
 # ### PR JOBS PART3
 # Long jobs (45min+)
 
 packet_debian9-calico-upgrade:
-  stage: deploy-part3
+  stage: deploy-part2
   extends: .packet
   when: on_success
   variables:
     UPGRADE_TEST: graceful
     MITOGEN_ENABLE: "false"
 
 packet_ubuntu18-calico-ha-recover:
-  stage: deploy-part3
+  stage: deploy-part2
   extends: .packet
   when: on_success
   variables:
     RECOVER_CONTROL_PLANE_TEST: "true"
     RECOVER_CONTROL_PLANE_TEST_GROUPS: "etcd[2:],kube-master[1:]"
 
 packet_ubuntu18-calico-ha-recover-noquorum:
-  stage: deploy-part3
+  stage: deploy-part2
   extends: .packet
   when: on_success
   variables:

diff --git a/README.md b/README.md
@@ -213,3 +213,5 @@ See also [Network checker](docs/netcheck.md).
 
 CI/end-to-end tests sponsored by Google (GCE)
 See the [test matrix](docs/test_cases.md) for details.
+
+TEST
Original file line number	Diff line number	Diff line change
Expand Up		@@ -213,3 +213,5 @@ See also [Network checker](docs/netcheck.md).

		CI/end-to-end tests sponsored by Google (GCE)
		See the [test matrix](docs/test_cases.md) for details.

		TEST