metal3: digests in release-1.3/1.4 fix

Digests in release-1.3 and release-1.4 branches need to match FROM
version, and in 1.5/main they need to match TO version. Adjust
digests to match this, and also move the digest line after the version
they are related to.

Change-Id: Iebdaadc88669ee9226647dcfb6b1b41f3f20844f

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index d33b739fa721109edaa0d9dd66582f9c107aeefc..ec0249202013d07037027b04fbbe9a5d992bd01a 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -26,7 +26,8 @@
 # jobs associated with that github repository. The job definitions can be found
 # in job_{job_id}.yml files in any of JJB include folders.
 
-# NOTE: kubectl_sha256 needs to match the kubernetes_version_to version
+# NOTE: kubectl_sha256 needs to match the kubernetes_version_upgrade_to version in 1.5/main
+# and it needs to match kubernetes_version_upgrade_from in 1.3/1.4
 
 - project:
     name: 'nordix_dev_tools'
@@ -292,16 +293,16 @@
                   - 'release-1.5'
             - 1-26-1-27:
                 k8s_version_upgrade_from: v1.26.4
+                kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
                 k8s_version_upgrade_to: v1.27.4
-                kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f  # v1.27.4
                 capm3_release_branch: release-1.4
                 capm3_target_branch: release-1-4
                 target_branches:
                   - 'release-1.4'
             - 1-25-1-26:
                 k8s_version_upgrade_from: v1.25.5
+                kubectl_sha256: 6a660cd44db3d4bfe1563f6689cbe2ffb28ee4baf3532e04fff2d7b909081c29  # v1.25.5
                 k8s_version_upgrade_to: v1.26.4
-                kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
                 capm3_release_branch: release-1.3
                 capm3_target_branch: release-1-3
                 target_branches:
@@ -468,16 +469,16 @@
                   - 'release-1.5'
             - 1-26-1-27:
                 k8s_version_upgrade_from: v1.26.4
+                kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
                 k8s_version_upgrade_to: v1.27.4
-                kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f  # v1.27.4
                 capm3_release_branch: release-1.4
                 capm3_target_branch: release-1-4
                 target_branches:
                   - 'release-1.4'
             - 1-25-1-26:
                 k8s_version_upgrade_from: v1.25.5
+                kubectl_sha256: 6a660cd44db3d4bfe1563f6689cbe2ffb28ee4baf3532e04fff2d7b909081c29  # v1.25.5
                 k8s_version_upgrade_to: v1.26.4
-                kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
                 capm3_release_branch: release-1.3
                 capm3_target_branch: release-1-3
                 target_branches:
@@ -536,14 +537,14 @@
                 capm3_target_branch: release-1-5
             - 1-26-1-27:
                 k8s_version_upgrade_from: v1.26.4
+                kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
                 k8s_version_upgrade_to: v1.27.4
-                kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f  # v1.27.4
                 capm3_release_branch: release-1.4
                 capm3_target_branch: release-1-4
             - 1-25-1-26:
                 k8s_version_upgrade_from: v1.25.5
+                kubectl_sha256: 6a660cd44db3d4bfe1563f6689cbe2ffb28ee4baf3532e04fff2d7b909081c29  # v1.25.5
                 k8s_version_upgrade_to: v1.26.4
-                kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d  # v1.26.4
                 capm3_release_branch: release-1.3
                 capm3_target_branch: release-1-3
           exclude: