From: Feruzjon Muyassarov Date: Fri, 29 Oct 2021 11:10:12 +0000 (+0000) Subject: Merge "Add Airship v1beta1 jobs" X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=a11e30729ef68367af80eec3f47534cb70be2800;hp=-c;p=infra%2Fcicd.git Merge "Add Airship v1beta1 jobs" --- a11e30729ef68367af80eec3f47534cb70be2800 diff --combined jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml index 9189cbe0,bf404b01..7cc3fc0b --- a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml @@@ -60,11 -60,11 +60,11 @@@ - string: name: CAPI_VERSION default: 'v1alpha4' - description: 'Cluster API version. Can be v1alpha4.' + description: 'Cluster API version.' - string: name: CAPM3_VERSION default: 'v1alpha5' - description: 'Cluster API provider Metal3 version. Can be v1alpha5 or v1alpha4.' + description: 'Cluster API provider Metal3 version.' - string: name: TARGET_NODE_OS default: 'Centos' @@@ -73,7 -73,7 +73,7 @@@ name: TARGET_NODE_MEMORY default: 4096 description: 'RAM size of the target host.' - + properties: - build-discarder: days-to-keep: 30 @@@ -82,7 -82,7 +82,7 @@@ artifact-num-to-keep: -1 triggers: - - timed: "H 4 * * *" + - timed: "30 4 * * *" pipeline-scm: scm: diff --combined jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml index 3f96a17a,72555509..3c6efafb --- a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml @@@ -60,11 -60,11 +60,11 @@@ - string: name: CAPI_VERSION default: 'v1alpha4' - description: 'Cluster API version. Can be v1alpha4.' + description: 'Cluster API version.' - string: name: CAPM3_VERSION default: 'v1alpha5' - description: 'Cluster API provider Metal3 version. Can be v1alpha5 or v1alpha4.' + description: 'Cluster API provider Metal3 version.' - string: name: TARGET_NODE_OS default: 'Ubuntu' @@@ -82,7 -82,7 +82,7 @@@ artifact-num-to-keep: -1 triggers: - - timed: "H 4 * * *" + - timed: "45 4 * * *" pipeline-scm: scm: diff --combined jjb/airship/job_feature_tests_centos.yml index 88a3af3d,e880a630..dc59e7bf --- a/jjb/airship/job_feature_tests_centos.yml +++ b/jjb/airship/job_feature_tests_centos.yml @@@ -81,10 -81,6 +81,10 @@@ name: TESTS_FOR default: "feature_tests_centos" description: 'Tests for pivoting and remediation.' + - string: + name: PROMETHEUS_MONITORING + default: "true" + description: 'Enable Prometheus metrics' properties: - build-discarder: @@@ -112,7 -108,8 +112,8 @@@ white-list-target-branches: - 'master' - 'main' - - 'release-0.4' + - 'release-0.5' + - 'release-0.1' status-context: "test-features-centos" success-status: "Passed" failure-status: "Failed" diff --combined jjb/airship/job_feature_tests_ubuntu.yml index c3037227,980dd6ff..da8b7376 --- a/jjb/airship/job_feature_tests_ubuntu.yml +++ b/jjb/airship/job_feature_tests_ubuntu.yml @@@ -81,10 -81,6 +81,10 @@@ name: TESTS_FOR default: "feature_tests" description: 'Tests for pivoting and remediation.' + - string: + name: PROMETHEUS_MONITORING + default: "true" + description: 'Enable Prometheus metrics' properties: - build-discarder: @@@ -112,7 -108,8 +112,8 @@@ white-list-target-branches: - 'master' - 'main' - - 'release-0.4' + - 'release-0.5' + - 'release-0.1' status-context: "test-features" success-status: "Passed" failure-status: "Failed" diff --combined jjb/airship/job_feature_tests_upgrade_ubuntu.yml index b64d50b3,d623ac20..2f26569f --- a/jjb/airship/job_feature_tests_upgrade_ubuntu.yml +++ b/jjb/airship/job_feature_tests_upgrade_ubuntu.yml @@@ -81,10 -81,6 +81,10 @@@ name: TESTS_FOR default: "feature_tests_upgrade" description: 'Tests for upgrade.' + - string: + name: PROMETHEUS_MONITORING + default: "true" + description: 'Enable Prometheus metrics' properties: - build-discarder: @@@ -112,7 -108,8 +112,8 @@@ white-list-target-branches: - 'master' - 'main' - - 'release-0.4' + - 'release-0.5' + - 'release-0.1' status-context: "test-upgrade-features" success-status: "Passed" failure-status: "Failed" diff --combined jjb/airship/projects.yml index c16cf95e,4d3e04c9..f63765f3 --- a/jjb/airship/projects.yml +++ b/jjb/airship/projects.yml @@@ -64,10 -64,13 +64,12 @@@ - capi_bm_v1a4_integration_tests_ubuntu - capi_bm_v1a5_integration_tests_centos - capi_bm_v1a5_integration_tests_ubuntu + - capm3_v1b1_integration_tests_centos + - capm3_v1b1_integration_tests_ubuntu - feature_tests_ubuntu - feature_tests_centos - feature_tests_upgrade_ubuntu - - bml_integration_test_centos - - bml_integration_test_ubuntu + - bml_integration_tests_centos - project: name: 'metal3io_project_infra_cleanup' @@@ -90,6 -93,8 +92,8 @@@ - capi_bm_v1a4_integration_tests_ubuntu - capi_bm_v1a5_integration_tests_centos - capi_bm_v1a5_integration_tests_ubuntu + - capm3_v1b1_integration_tests_centos + - capm3_v1b1_integration_tests_ubuntu - feature_tests_ubuntu - project: @@@ -102,6 -107,8 +106,8 @@@ - capi_bm_v1a4_integration_tests_ubuntu - capi_bm_v1a5_integration_tests_centos - capi_bm_v1a5_integration_tests_ubuntu + - capm3_v1b1_integration_tests_centos + - capm3_v1b1_integration_tests_ubuntu - project: name: "metal3io_metal3_dev_env" @@@ -114,14 -121,18 +120,18 @@@ - capi_bm_v1a5_integration_tests_ubuntu - capi_bm_v1a5_master_integration_tests_centos - capi_bm_v1a5_master_integration_tests_ubuntu + - capm3_v1b1_integration_tests_centos + - capm3_v1b1_integration_tests_ubuntu + - capm3_v1b1_master_integration_tests_centos + - capm3_v1b1_master_integration_tests_ubuntu - feature_tests_ubuntu - feature_tests_centos - feature_tests_upgrade_ubuntu - master_feature_tests_ubuntu - master_feature_tests_centos - master_feature_tests_upgrade_ubuntu - - bml_integration_test_centos - - bml_integration_test_ubuntu + - bml_integration_tests_centos + - bml_master_integration_tests_centos repo: org: "metal3-io" @@@ -141,6 -152,8 +151,8 @@@ - capi_capm3_v1a5_e2e_tests_centos - capi_capm3_v1a5_master_e2e_tests_ubuntu - capi_capm3_v1a5_master_e2e_tests_centos + - capm3_v1b1_integration_tests_centos + - capm3_v1b1_integration_tests_ubuntu - project: @@@ -153,6 -166,8 +165,8 @@@ - capi_bm_v1a4_integration_tests_ubuntu - capi_bm_v1a5_integration_tests_centos - capi_bm_v1a5_integration_tests_ubuntu + - capm3_v1b1_integration_tests_centos + - capm3_v1b1_integration_tests_ubuntu - project: name: "metal3io_ironic_ipa_downloader" @@@ -162,3 -177,5 +176,5 @@@ jobs: - capi_bm_v1a4_integration_tests_ubuntu - capi_bm_v1a5_integration_tests_ubuntu + - capm3_v1b1_integration_tests_centos + - capm3_v1b1_integration_tests_ubuntu