add KUBECTL_SHA256 to environment for passthru

We also need to add KUBECTL_SHA256 of the job environment for the
digest passthru to work.

Change-Id: I6c7a6afac76144f156e8dcd7364b80bb36d530e7

diff --git a/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests.yml b/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests.yml
index 13f418dde1dfa0db13f93a4dab7bc42872c8e8e0..8a8b1812674e8be03b2f2c766c6c08ebe2ad7b49 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests.yml
@@ -89,6 +89,10 @@
         name: KUBERNETES_VERSION_UPGRADE_TO
         default: '{k8s_version_upgrade_to}'
         description: 'Kubernetes version upgrade to'
+    - string:
+        name: KUBECTL_SHA256
+        default: '{kubectl_sha256}'
+        description: 'Kubectl SHA256 digest matching KUBERNETES_VERSION_UPGRADE_FROM'
 
     properties:
     - build-discarder:

diff --git a/jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests.yml b/jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests.yml
index 21666f1ab3a480ca5fddbf06c0f371c7b9545af8..688c1cc6e9c80ad6c725c84d83951704ca0a82b6 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests.yml
+++ b/jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests.yml
@@ -89,6 +89,10 @@
         name: KUBERNETES_VERSION_UPGRADE_TO
         default: '{k8s_version_upgrade_to}'
         description: 'Kubernetes version upgrade to'
+    - string:
+        name: KUBECTL_SHA256
+        default: '{kubectl_sha256}'
+        description: 'Kubectl SHA256 digest matching KUBERNETES_VERSION_UPGRADE_FROM'
 
     properties:
     - build-discarder:

diff --git a/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml b/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml
index fa005d44f65e72aa3a3d64ec69de73eb24cac883..d3c85afb0cae7b3d40671ab3bd3a09409bba675b 100644 (file)
--- a/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml
@@ -93,6 +93,10 @@
         name: KUBERNETES_VERSION_UPGRADE_TO
         default: '{k8s_version_upgrade_to}'
         description: 'Kubernetes version upgrade to'
+    - string:
+        name: KUBECTL_SHA256
+        default: '{kubectl_sha256}'
+        description: 'Kubectl SHA256 digest matching KUBERNETES_VERSION_UPGRADE_FROM'
 
     properties:
     - build-discarder:

diff --git a/jjb/metal3/job_openstack_image_building.yml b/jjb/metal3/job_openstack_image_building.yml
index aadee7ff84552a608b5ee49f0118571d9a73565c..ba02f466836c17dab759d8cf36bbdff1b61d707a 100644 (file)
--- a/jjb/metal3/job_openstack_image_building.yml
+++ b/jjb/metal3/job_openstack_image_building.yml
@@ -24,6 +24,8 @@
 # This job can be triggered manually or through a Github pull request. It creates a
 # pipeline job. The pipeline scripts are maintained in Nordix/metal3-dev-tools repository.
 
+# NOTE: KUBERNETES_VERSION and KUBECTL_SHA256 are changed as a pair
+
 - job-template:
     id: openstack_image_building
     name: '{job_prefix}_openstack_image_building'
@@ -37,6 +39,10 @@
         name: KUBERNETES_VERSION
         default: "v1.28.1"
         description: 'Kubernetes version'
+    - string:
+        name: KUBECTL_SHA256
+        default: 'e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1'  # v1.28.1
+        description: 'Kubectl SHA256 digest matching KUBERNETES_VERSION'
     - string:
         name: KIND_NODE_IMAGE_VERSION
         default: "v1.28.0"

diff --git a/jjb/metal3/job_openstack_node_image_building.yml b/jjb/metal3/job_openstack_node_image_building.yml
index 819624eea248d82a86ccc3bf810b6afb13b5a712..174a0f5f9cbc8d0a079af9cab0cfdb9ad1a4d14e 100644 (file)
--- a/jjb/metal3/job_openstack_node_image_building.yml
+++ b/jjb/metal3/job_openstack_node_image_building.yml
@@ -24,6 +24,8 @@
 # This job can be triggered manually or through a Github pull request. It creates a
 # pipeline job. The pipeline scripts are maintained in Nordix/metal3-dev-tools repository.
 
+# NOTE: KUBERNETES_VERSION and KUBECTL_SHA256 are changed as a pair
+
 - job-template:
     id: openstack_node_image_building
     name: '{job_prefix}_openstack_node_image_building'
@@ -37,6 +39,10 @@
         name: KUBERNETES_VERSION
         default: "v1.28.1"
         description: 'Kubernetes version'
+    - string:
+        name: KUBECTL_SHA256
+        default: 'e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1'  # v1.28.1
+        description: 'Kubectl SHA256 digest matching KUBERNETES_VERSION'
     - string:
         name: CRICTL_VERSION
         default: "v1.28.0"

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index c53320266398eaf093f1d6a95b0bcf8e21fd4c0a..c13afb59e94b2b6d8187183c8e3693efc64922d5 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -437,6 +437,7 @@
             - 1-27-1-28:
                 k8s_version_upgrade_from: v1.27.4
                 k8s_version_upgrade_to: v1.28.1
+                kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f  # v1.27.4
                 capm3_release_branch: main
                 capm3_target_branch: main
                 target_branches:
@@ -510,6 +511,7 @@
             - 1-27-1-28:
                 k8s_version_upgrade_from: v1.27.4
                 k8s_version_upgrade_to: v1.28.1
+                kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f  # v1.27.4
                 capm3_release_branch: main
                 capm3_target_branch: main
                 target_branches: