From c9fde59c0f29dbc82e096fadceb5441446c7aced Mon Sep 17 00:00:00 2001 From: Tuomo Tanskanen Date: Mon, 1 Jul 2024 15:51:16 +0300 Subject: [PATCH] remove KUBECTL_SHA256 passthru We verify the checksum via downloaded sha now, we don't need to pass it all the way from JJB anymore. Signed-off-by: Tuomo Tanskanen Change-Id: I036032982ea1d7bc222016e06f118f1ba04eda27 --- jjb/metal3/job_capm3_e2e_k8s_upgrade_tests_prow.yml | 7 +------ .../job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml | 9 ++------- jjb/metal3/job_node_image_building.yml | 6 ------ 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests_prow.yml index e901daab..8e1d67a0 100644 --- a/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests_prow.yml +++ b/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests_prow.yml @@ -1,4 +1,3 @@ ---- # # ============LICENSE_START======================================================= # Copyright (C) 2024 Nordix Foundation. @@ -100,10 +99,6 @@ 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: @@ -119,7 +114,7 @@ url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - - '{branch|main}' + - '{branch|main}' name: 'origin' refspec: '+refs/heads/*:refs/remotes/origin/*' wipe-workspace: True diff --git a/jjb/metal3/job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml index d49d5acf..206e7909 100644 --- a/jjb/metal3/job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml +++ b/jjb/metal3/job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml @@ -1,4 +1,3 @@ ---- # # ============LICENSE_START======================================================= # Copyright (C) 2024 Nordix Foundation. @@ -100,10 +99,6 @@ 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: @@ -113,7 +108,7 @@ artifact-num-to-keep: -1 triggers: - - timed: "{schedule}" + - timed: "{schedule}" pipeline-scm: scm: @@ -121,7 +116,7 @@ url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - - '{branch|main}' + - '{branch|main}' name: 'origin' refspec: '+refs/heads/*:refs/remotes/origin/*' wipe-workspace: True diff --git a/jjb/metal3/job_node_image_building.yml b/jjb/metal3/job_node_image_building.yml index 45388232..35eba077 100644 --- a/jjb/metal3/job_node_image_building.yml +++ b/jjb/metal3/job_node_image_building.yml @@ -23,8 +23,6 @@ # 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: node_image_building name: '{job_prefix}_periodic_node_image_building' @@ -42,10 +40,6 @@ name: KUBERNETES_VERSION default: "v1.30.0" description: 'Kubernetes version' - - string: - name: KUBECTL_SHA256 - default: '7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5' # v1.30.0 - description: 'Kubectl SHA256 digest matching KUBERNETES_VERSION' - string: name: CRICTL_VERSION default: "v1.30.0" -- 2.25.1