From 22522d995180af569328db152a53bc1c5c2cf6af Mon Sep 17 00:00:00 2001 From: Furkat Gofurov Date: Sat, 5 Feb 2022 22:15:22 +0200 Subject: [PATCH] Renames master mention to main in ipa building jobs. Changes m3-dev-tools trigger phrases accordingly and some minor improvements Change-Id: Ic453b485fc5f7a58e0c629e394f383fb0299bb6a --- jjb/metal3/job_artifactory_cleanup.yml | 2 +- jjb/metal3/job_bml_main_integration_tests_centos.yml | 2 +- jjb/metal3/job_capm3_v1a4_main_integration_tests_centos.yml | 4 ++-- jjb/metal3/job_capm3_v1a4_main_integration_tests_ubuntu.yml | 4 ++-- jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml | 2 +- jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml | 2 +- jjb/metal3/job_capm3_v1a5_integration_tests_centos.yml | 2 +- jjb/metal3/job_capm3_v1a5_integration_tests_ubuntu.yml | 2 +- jjb/metal3/job_capm3_v1a5_main_e2e_tests_centos.yml | 4 ++-- jjb/metal3/job_capm3_v1a5_main_e2e_tests_ubuntu.yml | 4 ++-- jjb/metal3/job_capm3_v1a5_main_integration_tests_centos.yml | 4 ++-- jjb/metal3/job_capm3_v1a5_main_integration_tests_ubuntu.yml | 4 ++-- jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml | 2 +- jjb/metal3/job_capm3_v1b1_e2e_tests_ubuntu.yml | 2 +- jjb/metal3/job_capm3_v1b1_e2e_upgrade_tests_ubuntu.yml | 4 ++-- jjb/metal3/job_capm3_v1b1_integration_tests_centos.yml | 2 +- jjb/metal3/job_capm3_v1b1_integration_tests_ubuntu.yml | 2 +- jjb/metal3/job_capm3_v1b1_main_e2e_tests_centos.yml | 2 +- jjb/metal3/job_capm3_v1b1_main_e2e_tests_ubuntu.yml | 4 ++-- jjb/metal3/job_capm3_v1b1_main_integration_tests_centos.yml | 2 +- jjb/metal3/job_capm3_v1b1_main_integration_tests_ubuntu.yml | 2 +- jjb/metal3/job_docker_image_building.yml | 2 +- jjb/metal3/job_feature_tests_centos.yml | 4 ++-- jjb/metal3/job_feature_tests_ubuntu.yml | 2 +- jjb/metal3/job_feature_tests_upgrade_ubuntu.yml | 2 +- jjb/metal3/job_keep_integration_vm_v1a5_centos.yml | 2 +- jjb/metal3/job_keep_integration_vm_v1a5_ubuntu.yml | 2 +- jjb/metal3/job_linter_tests.yml | 2 +- jjb/metal3/job_main_clean.yml | 2 +- jjb/metal3/job_main_feature_tests_centos.yml | 4 ++-- jjb/metal3/job_main_feature_tests_ubuntu.yml | 4 ++-- jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml | 4 ++-- ...a_image_building.yml => job_main_ipa_image_building.yml} | 4 ++-- jjb/metal3/job_metal3_dev_tools_integration_test_centos.yml | 6 +++--- jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml | 6 +++--- jjb/metal3/projects.yml | 2 +- 36 files changed, 53 insertions(+), 53 deletions(-) rename jjb/metal3/{job_ipa_image_building.yml => job_main_ipa_image_building.yml} (96%) diff --git a/jjb/metal3/job_artifactory_cleanup.yml b/jjb/metal3/job_artifactory_cleanup.yml index deff01d70..8cdc0ccff 100644 --- a/jjb/metal3/job_artifactory_cleanup.yml +++ b/jjb/metal3/job_artifactory_cleanup.yml @@ -20,7 +20,7 @@ # Description: # ============ -# This file contains job template definition for nordix Artifacotry cleanup. +# This file contains job template definition for nordix Artifactory cleanup. # This job can be triggered manually. It creates a pipeline job. # The pipeline scripts are maintained in Nordix/metal3-dev-tools repository. diff --git a/jjb/metal3/job_bml_main_integration_tests_centos.yml b/jjb/metal3/job_bml_main_integration_tests_centos.yml index 3075781d9..c2e332c5e 100644 --- a/jjb/metal3/job_bml_main_integration_tests_centos.yml +++ b/jjb/metal3/job_bml_main_integration_tests_centos.yml @@ -28,7 +28,7 @@ - job-template: id: bml_main_integration_tests_centos name: '{job_prefix}_main_bml_integration_tests_centos' - description: "CAPM3 v1beta1 integration tests for {repo[org]}/{repo[name]} on CentOS in Bare Metal Lab." + description: "CAPM3 v1beta1 main integration tests for {repo[org]}/{repo[name]} on CentOS in Bare Metal Lab." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_capm3_v1a4_main_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1a4_main_integration_tests_centos.yml index 194ccc2b0..661ba8e14 100644 --- a/jjb/metal3/job_capm3_v1a4_main_integration_tests_centos.yml +++ b/jjb/metal3/job_capm3_v1a4_main_integration_tests_centos.yml @@ -20,14 +20,14 @@ # Description: # ============ -# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) integration tests. +# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) main integration tests. # This job can be triggered manually or through a Github pull request. It creates a # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository. - job-template: id: capm3_v1a4_main_integration_tests_centos name: '{job_prefix}_main_v1a4_integration_test_centos' - description: "CAPM3 v1alpha4 integration tests for {repo[org]}/{repo[name]} on CentOS. " + description: "CAPM3 v1alpha4 main integration tests for {repo[org]}/{repo[name]} on CentOS." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_capm3_v1a4_main_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a4_main_integration_tests_ubuntu.yml index 3bee6fbae..305fe005d 100644 --- a/jjb/metal3/job_capm3_v1a4_main_integration_tests_ubuntu.yml +++ b/jjb/metal3/job_capm3_v1a4_main_integration_tests_ubuntu.yml @@ -20,14 +20,14 @@ # Description: # ============ -# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) integration tests. +# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) main integration tests. # This job can be triggered manually or through a Github pull request. It creates a # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository. - job-template: id: capm3_v1a4_main_integration_tests_ubuntu name: '{job_prefix}_main_v1a4_integration_test_ubuntu' - description: "CAPM3 v1alpha4 integration tests for {repo[org]}/{repo[name]} on Ubuntu. " + description: "CAPM3 v1alpha4 main integration tests for {repo[org]}/{repo[name]} on Ubuntu." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml b/jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml index 1e22392e3..c065a2bd8 100644 --- a/jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml +++ b/jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml @@ -27,7 +27,7 @@ - job-template: id: capm3_v1a5_e2e_tests_centos name: '{job_prefix}_{name}_v1a5_e2e_test_centos' - description: "CAPM3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on CentOS. " + description: "CAPM3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on CentOS." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml index 5330d9abc..bfe44106e 100644 --- a/jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml +++ b/jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml @@ -27,7 +27,7 @@ - job-template: id: capm3_v1a5_e2e_tests_ubuntu name: '{job_prefix}_{name}_v1a5_e2e_test_ubuntu' - description: "CAPM3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on Ubuntu. " + description: "CAPM3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on Ubuntu." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_capm3_v1a5_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1a5_integration_tests_centos.yml index 600154bbf..6bdb40dbf 100644 --- a/jjb/metal3/job_capm3_v1a5_integration_tests_centos.yml +++ b/jjb/metal3/job_capm3_v1a5_integration_tests_centos.yml @@ -27,7 +27,7 @@ - job-template: id: capm3_v1a5_integration_tests_centos name: '{job_prefix}_{name}_v1a5_integration_test_centos' - description: "CAPM3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on CentOS. " + description: "CAPM3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on CentOS." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_capm3_v1a5_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a5_integration_tests_ubuntu.yml index 96ef24395..dcd5eae40 100644 --- a/jjb/metal3/job_capm3_v1a5_integration_tests_ubuntu.yml +++ b/jjb/metal3/job_capm3_v1a5_integration_tests_ubuntu.yml @@ -27,7 +27,7 @@ - job-template: id: capm3_v1a5_integration_tests_ubuntu name: '{job_prefix}_{name}_v1a5_integration_test_ubuntu' - description: "CAPM3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on Ubuntu. " + description: "CAPM3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on Ubuntu." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_capm3_v1a5_main_e2e_tests_centos.yml b/jjb/metal3/job_capm3_v1a5_main_e2e_tests_centos.yml index c4e85bc1d..7edcff960 100644 --- a/jjb/metal3/job_capm3_v1a5_main_e2e_tests_centos.yml +++ b/jjb/metal3/job_capm3_v1a5_main_e2e_tests_centos.yml @@ -20,14 +20,14 @@ # Description: # ============ -# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) e2e tests. +# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) main e2e tests. # This job can be triggered manually or periodically by the CI system. It creates a # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository. - job-template: id: capm3_v1a5_main_e2e_tests_centos name: '{job_prefix}_main_v1a5_e2e_test_centos' - description: "CAPM3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on CentOS." + description: "CAPM3 v1alpha5 main e2e tests for {repo[org]}/{repo[name]} on CentOS." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_capm3_v1a5_main_e2e_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a5_main_e2e_tests_ubuntu.yml index 77d76621d..e40145971 100644 --- a/jjb/metal3/job_capm3_v1a5_main_e2e_tests_ubuntu.yml +++ b/jjb/metal3/job_capm3_v1a5_main_e2e_tests_ubuntu.yml @@ -20,14 +20,14 @@ # Description: # ============ -# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) e2e tests. +# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) main e2e tests. # This job can be triggered manually or periodically by the CI system. It creates a # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository. - job-template: id: capm3_v1a5_main_e2e_tests_ubuntu name: '{job_prefix}_main_v1a5_e2e_test_ubuntu' - description: "CAPM3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on Ubuntu." + description: "CAPM3 v1alpha5 main e2e tests for {repo[org]}/{repo[name]} on Ubuntu." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_capm3_v1a5_main_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1a5_main_integration_tests_centos.yml index 32b7df5e9..b3b471f71 100644 --- a/jjb/metal3/job_capm3_v1a5_main_integration_tests_centos.yml +++ b/jjb/metal3/job_capm3_v1a5_main_integration_tests_centos.yml @@ -20,14 +20,14 @@ # Description: # ============ -# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) integration tests. +# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) main integration tests. # This job can be triggered manually or through a Github pull request. It creates a # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository. - job-template: id: capm3_v1a5_main_integration_tests_centos name: '{job_prefix}_main_v1a5_integration_test_centos' - description: "CAPM3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on CentOS. " + description: "CAPM3 v1alpha5 main integration tests for {repo[org]}/{repo[name]} on CentOS." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_capm3_v1a5_main_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a5_main_integration_tests_ubuntu.yml index 79c7e2846..610cbf471 100644 --- a/jjb/metal3/job_capm3_v1a5_main_integration_tests_ubuntu.yml +++ b/jjb/metal3/job_capm3_v1a5_main_integration_tests_ubuntu.yml @@ -20,14 +20,14 @@ # Description: # ============ -# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) integration tests. +# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) main integration tests. # This job can be triggered manually or through a Github pull request. It creates a # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository. - job-template: id: capm3_v1a5_main_integration_tests_ubuntu name: '{job_prefix}_main_v1a5_integration_test_ubuntu' - description: "CAPM3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on Ubuntu. " + description: "CAPM3 v1alpha5 main integration tests for {repo[org]}/{repo[name]} on Ubuntu." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml b/jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml index 603813f1d..fe46ebae3 100644 --- a/jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml +++ b/jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml @@ -27,7 +27,7 @@ - job-template: id: capm3_v1b1_e2e_tests_centos name: '{job_prefix}_{name}_v1b1_e2e_test_centos' - description: "CAPM3 v1beta1 e2e tests for {repo[org]}/{repo[name]} on CentOS. " + description: "CAPM3 v1beta1 e2e tests for {repo[org]}/{repo[name]} on CentOS." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_capm3_v1b1_e2e_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_e2e_tests_ubuntu.yml index 364d0da71..0b72f418a 100644 --- a/jjb/metal3/job_capm3_v1b1_e2e_tests_ubuntu.yml +++ b/jjb/metal3/job_capm3_v1b1_e2e_tests_ubuntu.yml @@ -27,7 +27,7 @@ - job-template: id: capm3_v1b1_e2e_tests_ubuntu name: '{job_prefix}_{name}_v1b1_e2e_test_ubuntu' - description: "CAPM3 v1beta1 e2e tests for {repo[org]}/{repo[name]} on Ubuntu. " + description: "CAPM3 v1beta1 e2e tests for {repo[org]}/{repo[name]} on Ubuntu." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_capm3_v1b1_e2e_upgrade_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_e2e_upgrade_tests_ubuntu.yml index f124d51a4..255fc2f57 100644 --- a/jjb/metal3/job_capm3_v1b1_e2e_upgrade_tests_ubuntu.yml +++ b/jjb/metal3/job_capm3_v1b1_e2e_upgrade_tests_ubuntu.yml @@ -20,14 +20,14 @@ # Description: # ============ -# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) e2e tests. +# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) e2e upgrade tests. # This job can be triggered manually or through a Github pull request. It creates a # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository. - job-template: id: capm3_v1b1_e2e_upgrade_tests_ubuntu name: '{job_prefix}_{name}_v1b1_e2e_upgrade_test_ubuntu' - description: "CAPM3 v1beta1 e2e upgrade tests for {repo[org]}/{repo[name]} on Ubuntu. " + description: "CAPM3 v1beta1 e2e upgrade tests for {repo[org]}/{repo[name]} on Ubuntu." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_capm3_v1b1_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1b1_integration_tests_centos.yml index 76b672cf2..dd81c7706 100644 --- a/jjb/metal3/job_capm3_v1b1_integration_tests_centos.yml +++ b/jjb/metal3/job_capm3_v1b1_integration_tests_centos.yml @@ -20,7 +20,7 @@ # Description: # ============ -# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) v1beta1 integration tests. +# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) integration tests. # This job can be triggered manually or through a Github pull request. It creates a # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository. diff --git a/jjb/metal3/job_capm3_v1b1_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_integration_tests_ubuntu.yml index 296ed893c..5fc10acdf 100644 --- a/jjb/metal3/job_capm3_v1b1_integration_tests_ubuntu.yml +++ b/jjb/metal3/job_capm3_v1b1_integration_tests_ubuntu.yml @@ -20,7 +20,7 @@ # Description: # ============ -# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) v1beta1 integration tests. +# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) integration tests. # This job can be triggered manually or through a Github pull request. It creates a # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository. diff --git a/jjb/metal3/job_capm3_v1b1_main_e2e_tests_centos.yml b/jjb/metal3/job_capm3_v1b1_main_e2e_tests_centos.yml index 0215f1176..e145f5065 100644 --- a/jjb/metal3/job_capm3_v1b1_main_e2e_tests_centos.yml +++ b/jjb/metal3/job_capm3_v1b1_main_e2e_tests_centos.yml @@ -20,7 +20,7 @@ # Description: # ============ -# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) e2e tests. +# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) main e2e tests. # This job can be triggered manually or periodically by the CI system. It creates a # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository. diff --git a/jjb/metal3/job_capm3_v1b1_main_e2e_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_main_e2e_tests_ubuntu.yml index 868c74300..40a19685a 100644 --- a/jjb/metal3/job_capm3_v1b1_main_e2e_tests_ubuntu.yml +++ b/jjb/metal3/job_capm3_v1b1_main_e2e_tests_ubuntu.yml @@ -26,8 +26,8 @@ - job-template: id: capm3_v1b1_main_e2e_tests_ubuntu - name: '{job_prefix}_main_e2e_v1b1_test_ubuntu' - description: "CAPM3 v1beta1 e2e tests for {repo[org]}/{repo[name]} on Ubuntu." + name: '{job_prefix}_main_v1b1_e2e_test_ubuntu' + description: "CAPM3 v1beta1 main e2e tests for {repo[org]}/{repo[name]} on Ubuntu." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_capm3_v1b1_main_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1b1_main_integration_tests_centos.yml index 2922c3913..8ebf2ace1 100644 --- a/jjb/metal3/job_capm3_v1b1_main_integration_tests_centos.yml +++ b/jjb/metal3/job_capm3_v1b1_main_integration_tests_centos.yml @@ -20,7 +20,7 @@ # Description: # ============ -# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) v1beta1 main integration tests. +# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) main integration tests. # This job can be triggered manually or through a Github pull request. It creates a # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository. diff --git a/jjb/metal3/job_capm3_v1b1_main_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_main_integration_tests_ubuntu.yml index def12bbf4..256e4460a 100644 --- a/jjb/metal3/job_capm3_v1b1_main_integration_tests_ubuntu.yml +++ b/jjb/metal3/job_capm3_v1b1_main_integration_tests_ubuntu.yml @@ -20,7 +20,7 @@ # Description: # ============ -# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) v1beta1 main integration tests. +# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) main integration tests. # This job can be triggered manually or through a Github pull request. It creates a # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository. diff --git a/jjb/metal3/job_docker_image_building.yml b/jjb/metal3/job_docker_image_building.yml index 12f85e6f7..c6c8f41b5 100644 --- a/jjb/metal3/job_docker_image_building.yml +++ b/jjb/metal3/job_docker_image_building.yml @@ -27,7 +27,7 @@ - job-template: id: docker_image_building name: '{job_prefix}_docker_image_building' - description: "Docker image builder job. " + description: "Docker image builder job." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_feature_tests_centos.yml b/jjb/metal3/job_feature_tests_centos.yml index f18616a2d..6720a6215 100644 --- a/jjb/metal3/job_feature_tests_centos.yml +++ b/jjb/metal3/job_feature_tests_centos.yml @@ -20,14 +20,14 @@ # Description: # ============ -# This file contains job template definition for K8s CAPI Baremetal feature tests. +# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) feature tests. # This job can be triggered manually or through a Github pull request. It creates a # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository. - job-template: id: feature_tests_centos name: '{job_prefix}_{name}_feature_tests_centos' - description: "Pivoting and Remediation tests on Centos. " + description: "Inspection, remediation, pivoting, node reuse and repivoting feature tests on Centos." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_feature_tests_ubuntu.yml b/jjb/metal3/job_feature_tests_ubuntu.yml index 13dd599c9..1704e7bd2 100644 --- a/jjb/metal3/job_feature_tests_ubuntu.yml +++ b/jjb/metal3/job_feature_tests_ubuntu.yml @@ -27,7 +27,7 @@ - job-template: id: feature_tests_ubuntu name: '{job_prefix}_{name}_feature_tests_ubuntu' - description: "Pivoting and Remediation tests on Ubuntu. " + description: "Inspection, remediation, pivoting, node reuse and repivoting feature tests on Ubuntu." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_feature_tests_upgrade_ubuntu.yml b/jjb/metal3/job_feature_tests_upgrade_ubuntu.yml index 79f01a30b..1ff63cc6a 100644 --- a/jjb/metal3/job_feature_tests_upgrade_ubuntu.yml +++ b/jjb/metal3/job_feature_tests_upgrade_ubuntu.yml @@ -28,7 +28,7 @@ - job-template: id: feature_tests_upgrade_ubuntu name: '{job_prefix}_{name}_feature_tests_upgrade_ubuntu' - description: "Upgrade tests on Ubuntu. " + description: "Upgrade tests on Ubuntu." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_keep_integration_vm_v1a5_centos.yml b/jjb/metal3/job_keep_integration_vm_v1a5_centos.yml index 8e48a4535..c256c0480 100644 --- a/jjb/metal3/job_keep_integration_vm_v1a5_centos.yml +++ b/jjb/metal3/job_keep_integration_vm_v1a5_centos.yml @@ -28,7 +28,7 @@ - job-template: id: keep_v1a5_test_centos_alive name: '{job_prefix}_{name}_keep_v1a5_test_centos_alive' - description: "CAPM3 v1alpha5 integration tests for keeping the vm for {repo[org]}/{repo[name]} on CentOS. " + description: "CAPM3 v1alpha5 integration tests for keeping the vm for {repo[org]}/{repo[name]} on CentOS." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_keep_integration_vm_v1a5_ubuntu.yml b/jjb/metal3/job_keep_integration_vm_v1a5_ubuntu.yml index fa02bd32a..8fe3eebb3 100644 --- a/jjb/metal3/job_keep_integration_vm_v1a5_ubuntu.yml +++ b/jjb/metal3/job_keep_integration_vm_v1a5_ubuntu.yml @@ -28,7 +28,7 @@ - job-template: id: keep_v1a5_test_ubuntu_alive name: '{job_prefix}_{name}_keep_v1a5_test_ubuntu_alive' - description: "CAPM3 v1alpha5 integration tests for keeping the vm for {repo[org]}/{repo[name]} on Ubuntu. " + description: "CAPM3 v1alpha5 integration tests for keeping the vm for {repo[org]}/{repo[name]} on Ubuntu." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_linter_tests.yml b/jjb/metal3/job_linter_tests.yml index 3d48d585f..df5d291c1 100644 --- a/jjb/metal3/job_linter_tests.yml +++ b/jjb/metal3/job_linter_tests.yml @@ -27,7 +27,7 @@ - job-template: id: linter_tests name: '{job_prefix}_{name}_linter_test' - description: "Code linting tests for {repo[org]}/{repo[name]}. " + description: "Code linting tests for {repo[org]}/{repo[name]}." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_main_clean.yml b/jjb/metal3/job_main_clean.yml index f4a642c96..03d1b0f76 100644 --- a/jjb/metal3/job_main_clean.yml +++ b/jjb/metal3/job_main_clean.yml @@ -28,7 +28,7 @@ - job-template: id: main_clean name: '{job_prefix}_main_integration_tests_cleanup' - description: "K8s CAPM3 integration tests cleanup" + description: "CAPM3 integration tests cleanup" project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_main_feature_tests_centos.yml b/jjb/metal3/job_main_feature_tests_centos.yml index 2fb39c1f7..513e874bb 100644 --- a/jjb/metal3/job_main_feature_tests_centos.yml +++ b/jjb/metal3/job_main_feature_tests_centos.yml @@ -21,14 +21,14 @@ # Description: # ============ # This file contains job template definition for Cluster API Provider Metal3 (CAPM3) -# feature tests. +# main feature tests. # This job can be triggered manually or through a Github pull request. It creates a # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository. - job-template: id: main_feature_tests_centos name: '{job_prefix}_main_feature_tests_centos' - description: "Pivoting and Remediation tests on Centos. " + description: "Inspection, remediation, pivoting, node reuse and repivoting main feature tests on Centos." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_main_feature_tests_ubuntu.yml b/jjb/metal3/job_main_feature_tests_ubuntu.yml index 8bd3157b2..7bf67f052 100644 --- a/jjb/metal3/job_main_feature_tests_ubuntu.yml +++ b/jjb/metal3/job_main_feature_tests_ubuntu.yml @@ -21,14 +21,14 @@ # Description: # ============ # This file contains job template definition for Cluster API Provider Metal3 (CAPM3) -# feature tests. +# main feature tests. # This job can be triggered manually or through a Github pull request. It creates a # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository. - job-template: id: main_feature_tests_ubuntu name: '{job_prefix}_main_feature_tests_ubuntu' - description: "Pivoting and Remediation tests on Ubuntu. " + description: "Inspection, remediation, pivoting, node reuse and repivoting main feature tests on Ubuntu." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml b/jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml index ed9b168e9..d927a8652 100644 --- a/jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml +++ b/jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml @@ -21,14 +21,14 @@ # Description: # ============ # This file contains job template definition for Cluster API Provider Metal3 (CAPM3) -# feature upgrade tests. +# main feature upgrade tests. # This job can be triggered manually or through a Github pull request. It creates a # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository. - job-template: id: main_feature_tests_upgrade_ubuntu name: '{job_prefix}_main_feature_tests_upgrade_ubuntu' - description: "Upgrade tests on Ubuntu. " + description: "Upgrade main tests on Ubuntu." project-type: pipeline defaults: global disabled: False diff --git a/jjb/metal3/job_ipa_image_building.yml b/jjb/metal3/job_main_ipa_image_building.yml similarity index 96% rename from jjb/metal3/job_ipa_image_building.yml rename to jjb/metal3/job_main_ipa_image_building.yml index 808227f3a..2e593db37 100644 --- a/jjb/metal3/job_ipa_image_building.yml +++ b/jjb/metal3/job_main_ipa_image_building.yml @@ -25,8 +25,8 @@ # The pipeline scripts are maintained in Nordix/metal3-dev-tools repository. - job-template: - id: openstack_ipa_and_ironic_image_building - name: '{job_prefix}_master_openstack_ipa_and_ironic_image_building' + id: main_openstack_ipa_and_ironic_image_building + name: '{job_prefix}_main_openstack_ipa_and_ironic_image_building' description: "IPA and Ironic image building" project-type: pipeline defaults: global diff --git a/jjb/metal3/job_metal3_dev_tools_integration_test_centos.yml b/jjb/metal3/job_metal3_dev_tools_integration_test_centos.yml index 746ad6ed6..67dfd9515 100644 --- a/jjb/metal3/job_metal3_dev_tools_integration_test_centos.yml +++ b/jjb/metal3/job_metal3_dev_tools_integration_test_centos.yml @@ -28,7 +28,7 @@ - job-template: id: metal3_dev_tools_integration_test_centos name: 'metal3_dev_tools_integration_test_centos' - description: "CAPM3 v1beta1 integration tests for {repo[org]}/{repo[name]} on CentOS. " + description: "CAPM3 v1beta1 metal3-dev-tools integration tests for {repo[org]}/{repo[name]} on CentOS." project-type: pipeline defaults: global disabled: False @@ -95,7 +95,7 @@ org-list: "{ci_github_whitelist_org}" cron: 'H/5 * * * *' auth-id: "{ci_ghprb_auth_id}" - trigger-phrase: '((.|\n)*\s)?/test-integration-metal3-centos(\s(.|\n)*)?' + trigger-phrase: '((.|\n)*\s)?/test-integration-metal3-dev-tools-centos(\s(.|\n)*)?' skip-build-phrase: '/skip-test' only-trigger-phrase: True github-hooks: True @@ -105,7 +105,7 @@ white-list-target-branches: - 'master' - 'main' - status-context: "test-integration-metal3-centos" + status-context: "test-integration-metal3-dev-tools-centos" success-status: "Passed" failure-status: "Failed" error-status: "Error" diff --git a/jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml b/jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml index ed244edc9..d92f2dcdf 100644 --- a/jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml +++ b/jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml @@ -28,7 +28,7 @@ - job-template: id: metal3_dev_tools_integration_test_ubuntu name: 'metal3_dev_tools_integration_test_ubuntu' - description: "CAPM3 v1beta1 integration tests for {repo[org]}/{repo[name]} on Ubuntu. " + description: "CAPM3 v1beta1 metal3-dev-tools integration tests for {repo[org]}/{repo[name]} on Ubuntu." project-type: pipeline defaults: global disabled: False @@ -95,7 +95,7 @@ org-list: "{ci_github_whitelist_org}" cron: 'H/5 * * * *' auth-id: "{ci_ghprb_auth_id}" - trigger-phrase: '((.|\n)*\s)?/test-integration-metal3-ubuntu(\s(.|\n)*)?' + trigger-phrase: '((.|\n)*\s)?/test-integration-metal3-dev-tools-ubuntu(\s(.|\n)*)?' skip-build-phrase: '/skip-test' only-trigger-phrase: True github-hooks: True @@ -104,7 +104,7 @@ allow-whitelist-orgs-as-admins: True white-list-target-branches: - 'master' - status-context: "test-integration-metal3-ubuntu" + status-context: "test-integration-metal3-dev-tools-ubuntu" success-status: "Passed" failure-status: "Failed" error-status: "Error" diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml index 1aaa7c7b2..ef6530e38 100644 --- a/jjb/metal3/projects.yml +++ b/jjb/metal3/projects.yml @@ -38,7 +38,7 @@ - update_nordix_artifacts - update_nordix_repos - openstack_node_image_building - - openstack_ipa_and_ironic_image_building + - main_openstack_ipa_and_ironic_image_building - metal3_ipa_and_ironic_image_building_test - metal3_dev_tools_integration_test_centos - metal3_dev_tools_integration_test_ubuntu -- 2.25.1