From: Kashif Khan Date: Thu, 23 Sep 2021 10:04:20 +0000 (+0000) Subject: Merge "Modify timing for automated ipa-ironic builds" X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=a3415efa42d0fa5ae7d7e1adb66adee0cfec2bcf;hp=50a383759ec8ec637f09f054841dc9d073e2b751;p=infra%2Fcicd.git Merge "Modify timing for automated ipa-ironic builds" --- diff --git a/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml index 238b91e3..4fe1c682 100644 --- a/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml @@ -73,7 +73,11 @@ name: TARGET_NODE_MEMORY default: 4096 description: 'RAM size of the target host.' - + - string: + name: KUBERNETES_VERSION + default: "v1.21.2" + description: 'Kubernetes version' + properties: - build-discarder: days-to-keep: 30 diff --git a/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml index 671345d0..e878814c 100644 --- a/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml @@ -73,7 +73,11 @@ name: TARGET_NODE_MEMORY default: 4096 description: 'RAM size of the target host.' - + - string: + name: KUBERNETES_VERSION + default: "v1.21.2" + description: 'Kubernetes version' + properties: - build-discarder: days-to-keep: 30 diff --git a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml index 16903f5a..0ba9bb44 100644 --- a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml @@ -73,7 +73,11 @@ name: TARGET_NODE_MEMORY default: 4096 description: 'RAM size of the target host.' - + - string: + name: KUBERNETES_VERSION + default: "v1.21.2" + description: 'Kubernetes version' + properties: - build-discarder: days-to-keep: 30 @@ -82,7 +86,7 @@ artifact-num-to-keep: -1 triggers: - - timed: "@midnight" + - timed: "H 4 * * *" pipeline-scm: scm: diff --git a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml index 9bd4b4d6..1dabb07d 100644 --- a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml @@ -73,7 +73,11 @@ name: TARGET_NODE_MEMORY default: 4096 description: 'RAM size of the target host.' - + - string: + name: KUBERNETES_VERSION + default: "v1.21.2" + description: 'Kubernetes version' + properties: - build-discarder: days-to-keep: 30 @@ -82,7 +86,7 @@ artifact-num-to-keep: -1 triggers: - - timed: "@midnight" + - timed: "H 4 * * *" pipeline-scm: scm: diff --git a/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml index 3929242f..0e0d7802 100644 --- a/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml @@ -73,7 +73,11 @@ name: TARGET_NODE_MEMORY default: 4096 description: 'RAM size of the target host.' - + - string: + name: KUBERNETES_VERSION + default: "v1.22.0" + description: 'Kubernetes version' + properties: - build-discarder: days-to-keep: 30 diff --git a/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml index 90290a21..8cc6b960 100644 --- a/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml @@ -73,7 +73,11 @@ name: TARGET_NODE_MEMORY default: 4096 description: 'RAM size of the target host.' - + - string: + name: KUBERNETES_VERSION + default: "v1.22.0" + description: 'Kubernetes version' + properties: - build-discarder: days-to-keep: 30 diff --git a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml index 8daae8b9..1e6e2d19 100644 --- a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml @@ -73,7 +73,11 @@ name: TARGET_NODE_MEMORY default: 4096 description: 'RAM size of the target host.' - + - string: + name: KUBERNETES_VERSION + default: "v1.22.0" + description: 'Kubernetes version' + properties: - build-discarder: days-to-keep: 30 @@ -82,7 +86,7 @@ artifact-num-to-keep: -1 triggers: - - timed: "@midnight" + - timed: "H 4 * * *" pipeline-scm: scm: diff --git a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml index 97b99473..3e3b0f16 100644 --- a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml @@ -73,7 +73,11 @@ name: TARGET_NODE_MEMORY default: 4096 description: 'RAM size of the target host.' - + - string: + name: KUBERNETES_VERSION + default: "v1.22.0" + description: 'Kubernetes version' + properties: - build-discarder: days-to-keep: 30 @@ -82,7 +86,7 @@ artifact-num-to-keep: -1 triggers: - - timed: "@midnight" + - timed: "H 4 * * *" pipeline-scm: scm: diff --git a/jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml b/jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml index 7afd3a29..c7ba0e82 100644 --- a/jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml +++ b/jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml @@ -77,7 +77,11 @@ name: TESTS_FOR default: "e2e_tests" description: 'Tests using the e2e framework.' - + - string: + name: KUBERNETES_VERSION + default: "v1.22.0" + description: 'Kubernetes version' + properties: - build-discarder: days-to-keep: 30 diff --git a/jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml b/jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml index 4306994c..32a242d0 100644 --- a/jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml +++ b/jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml @@ -77,7 +77,11 @@ name: TESTS_FOR default: "e2e_tests" description: 'Tests using the e2e framework.' - + - string: + name: KUBERNETES_VERSION + default: "v1.22.0" + description: 'Kubernetes version' + properties: - build-discarder: days-to-keep: 30 diff --git a/jjb/airship/job_openstack_image_building.yml b/jjb/airship/job_openstack_image_building.yml index 6261f518..6e7b0415 100644 --- a/jjb/airship/job_openstack_image_building.yml +++ b/jjb/airship/job_openstack_image_building.yml @@ -32,7 +32,12 @@ defaults: global disabled: False concurrent: True - + parameters: + - string: + name: KUBERNETES_VERSION + default: "v1.22.0" + description: 'Kubernetes version' + properties: - build-discarder: days-to-keep: 30 diff --git a/jjb/airship/job_openstack_node_image_building.yml b/jjb/airship/job_openstack_node_image_building.yml index 42f1a7d9..8e257ee8 100644 --- a/jjb/airship/job_openstack_node_image_building.yml +++ b/jjb/airship/job_openstack_node_image_building.yml @@ -32,7 +32,12 @@ defaults: global disabled: False concurrent: True - + parameters: + - string: + name: KUBERNETES_VERSION + default: "v1.22.0" + description: 'Kubernetes version' + properties: - build-discarder: days-to-keep: 30 diff --git a/jjb/cloud-infra/engine-jobs/engine-verify-package.yaml b/jjb/cloud-infra/engine-jobs/engine-verify-package.yaml index c2943766..f58c35c0 100644 --- a/jjb/cloud-infra/engine-jobs/engine-verify-package.yaml +++ b/jjb/cloud-infra/engine-jobs/engine-verify-package.yaml @@ -157,7 +157,9 @@ - shell: | #!/bin/bash sudo chown -R $USER:$USER $WORKSPACE || exit 1 - + - ssh-agent-credentials: + users: + - 'city-nordix-jenkins-ssh' builders: - 'generate-change-metadata-macro'