nits and doc

kubernetes · May 3, 2019 · 5402126 · 5402126
1 parent 0706be4
commit 5402126
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/kinder/ci/kubeadm-ci.md b/kinder/ci/kubeadm-ci.md
@@ -29,8 +29,7 @@ might be eventually repeated across all/a subset of the Kubernetes versions in s
 
 ### Upgrade tests
 
-Upgrade tests are meant to verify the proper functioning of the `kubeadm upgrade` workflow. More
-specifically the following upgrade tests are verified:
+Upgrade tests are meant to verify the proper functioning of the `kubeadm upgrade` workflow. Following upgrade tests are verified:
 
 | from                                         | e.g.              | to                                     | e.g.             |
 | -------------------------------------------- | ----------------- | -------------------------------------- | ---------------- |
@@ -44,13 +43,13 @@ others ci-->latest). Define if/how to rationalize
 
 ### X on Y tests
 
-X on Y tests are meant to verify the proper functioning of kubeadm version X with Kubernetes Y = X-1/minor.
-More specifically following X on Y tests are verified:
+X on Y tests are meant to verify the proper functioning of kubeadm version X with Kubernetes Y = X-1/minor. Following X on Y tests are implemented:
 
-| kubeadm (X) | e.g. | Kubernetes (Y) | e.g. |
-| ----------- | ---- | -------------- | ---- |
-|             |      |                |      |
-|             |      |                |      |
-|             |      |                |      |
-|             |      |                |      |
-|             |      |                |      |
+| kubeadm (X)                            | e.g.             | Kubernetes (Y)                         | e.g.              |
+| -------------------------------------- | ---------------- | -------------------------------------- | ----------------- |
+| master<br />(ci/latest)                | v1.15.0-alpha... | current<br />(release/stable)          | v1.14.1           |
+| current<br />(ci/latest-1.14)          | v1.14.1-alpha... | current -1/minor<br />(ci/latest-1.13) | V1.13.6-alpha...  |
+| current -1/minor<br />(ci/latest-1.13) | V1.13.6-alpha... | current -2/minor<br />(ci/latest-1.12) | V1.12.9-alpha...  |
+| current -2/minor<br />(ci/latest-1.12) | V1.12.9-alpha... | current -3/minor<br />(ci/latest-1.11) | V1.11.10-alpha... |
+
+TODO: currently tests are not consistent with regards to the selection of from/to versions (some ci on stable, others ci on ci). Define if/how to rationalize
diff --git a/kinder/ci/workflows/upgrade-1.11-1.12.yaml → kinder/ci/workflows/upgrade-1.11-1.13.yaml b/kinder/ci/workflows/upgrade-1.11-1.12.yaml → kinder/ci/workflows/upgrade-1.11-1.13.yaml
diff --git a/kinder/ci/workflows/upgrade-stable-master.yaml b/kinder/ci/workflows/upgrade-stable-master.yaml
@@ -14,7 +14,7 @@ vars:
   clusterName: kinder-upgrade
 tasks:
 # Important! this worflow is using locally defined task instead of the shared upgrade-task.yaml
-# because e2e-kubeadm is execute after the upgrade (nb. e2e-kubeadm was heavily refactored in v1.15 cycle)
+# because e2e-kubeadm is executed after the upgrade (nb. e2e-kubeadm was heavily refactored in v1.15 cycle)
 - name: pull-base-image
   description: |
     pulls kindest/base image with docker in docker and all the prerequisites necessary for running kind(er)
@@ -93,7 +93,7 @@ tasks:
   args:
     - test
     - e2e-kubeadm
-    - --test-flags=--report-dir={{ .env.ARTIFACTS }} --report-prefix=02-e2e-kubeadm-after-upgrade
+    - --test-flags=--report-dir={{ .env.ARTIFACTS }} --report-prefix=e2e-kubeadm-after-upgrade
     - --name={{ .vars.clusterName }}
 - name: cluster-info-after
   description: |
@@ -110,7 +110,7 @@ tasks:
   args:
     - test
     - e2e
-    - --test-flags=--report-dir={{ .env.ARTIFACTS }} --report-prefix=03-e2e-after-upgrade
+    - --test-flags=--report-dir={{ .env.ARTIFACTS }} --report-prefix=e2e-after-upgrade
     - --parallel
     - --name={{ .vars.clusterName }}
   timeout: 25m

diff --git a/kinder/ci/workflows/upgrade-tasks.yaml b/kinder/ci/workflows/upgrade-tasks.yaml
@@ -101,7 +101,7 @@ tasks:
   args:
     - test
     - e2e
-    - --test-flags=--report-dir={{ .env.ARTIFACTS }} --report-prefix=03-e2e-after-upgrade
+    - --test-flags=--report-dir={{ .env.ARTIFACTS }} --report-prefix=e2e-after-upgrade
     - --parallel
     - --name={{ .vars.clusterName }}
   timeout: 25m