Renames master mention to main in ipa building jobs. Changes m3-dev-tools trigger...

accordingly and some minor improvements

Change-Id: Ic453b485fc5f7a58e0c629e394f383fb0299bb6a

diff --git a/jjb/metal3/job_artifactory_cleanup.yml b/jjb/metal3/job_artifactory_cleanup.yml
index deff01d70b8750c7479a3e83354f9e4565f85178..8cdc0ccffba16f21c16c5ec714671ab4b1e6db18 100644 (file)
--- 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 3075781d9bd7e9200a15ec025579b6b494d5b1e7..c2e332c5e1994ab39b1f7d8dd42f6174f16de714 100644 (file)
--- 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 194ccc2b0f711f0768ea9734a2531d7d743a8dfe..661ba8e142c3bbfc5ce105fc77f3186eb477d0ea 100644 (file)
--- 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 3bee6fbaeb6cee68c2232ec78a88a2d1fb226a33..305fe005d09d9a4017d1eb04cd1e99231ed78419 100644 (file)
--- 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 1e22392e3523a8cac4e57f9a0bab3333a766a279..c065a2bd81b3e2ad8277a79be87079fdf632a979 100644 (file)
--- 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 5330d9abc827d6438f9a74a5552a4d21de1bc1c5..bfe44106e596f5661f78c9e10102f8f21fa516af 100644 (file)
--- 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 600154bbfdb2337edcfffdc70884fd599239ed02..6bdb40dbf4ffba2e82392ae36fe13288fdcfdf8a 100644 (file)
--- 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 96ef243950734036d70a4684e5a56f2a82e9b81a..dcd5eae40e44e870cf8c7ad1ed9ea082fc4f144d 100644 (file)
--- 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 c4e85bc1d0c8a1a5f10285a0b7c0d19f57556a83..7edcff96053303499594f88b2d3f69e1265efad4 100644 (file)
--- 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 77d76621da63a76831d3b1ac41cb2678d274eb3b..e4014597167764a1021e5cf730365f7ed5f2bf98 100644 (file)
--- 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 32b7df5e9b8fdc300264a177af5a7ea58de2342f..b3b471f71637a1f98806da155861b76f65d5baa6 100644 (file)
--- 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 79c7e28464a12f6f929e1ffb6f178a9b0a4a4d23..610cbf471e8d4b350c5309af0222b59ee40f8f2b 100644 (file)
--- 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 603813f1d4273e31e7b44ba4d0949c60bbe562a0..fe46ebae3c2a2dd7d3a380064120dd18e91cc7d0 100644 (file)
--- 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 364d0da714402a8c5ba1e8a14385a2c370d58497..0b72f418a1466f3109444f2bd8ea9a0858d5f3ab 100644 (file)
--- 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 f124d51a4d06c6ecb90c474646453067d6c7a25c..255fc2f5734fc8d0311e4d11386c168b97df9a52 100644 (file)
--- 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 76b672cf2228b363e1b4bbab8c73f4a50140deec..dd81c7706be91a643e349d0dbb83e3077148b528 100644 (file)
--- 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 296ed893c8566979e2bd57a8479d609817e353b7..5fc10acdf0783301f0a6d41cfe1255f99f45770c 100644 (file)
--- 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 0215f11769e82e29d7abd3479b308cdc68f6fe73..e145f50651b6d310221f67e048b74074981b7a90 100644 (file)
--- 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 868c7430018612498f3ccba3bfe5ee4d183146cf..40a19685ad819b1790bd02fb560b568ba5cf779d 100644 (file)
--- 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 2922c3913cd8a13fadef434c158b0229df8693b2..8ebf2ace1bbc3021455361cbf62cd4c5acc792e3 100644 (file)
--- 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 def12bbf47a534895ff4cf5e05d881a815838c9d..256e4460acb88d3186495094e692a21422819b36 100644 (file)
--- 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 12f85e6f7d1dcc0405bcded5a29ffc136b3f9604..c6c8f41b5a955cf676390df53535de11b271187c 100644 (file)
--- 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 f18616a2dd19e90f683fe1413c2be662ad9b9f82..6720a6215603648241dcbb1c72761e4284ede77b 100644 (file)
--- 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 13dd599c9d4a04aaf5e48533cbd6832b6701d505..1704e7bd23d87af0409e8e47cf4ba3798314c3a7 100644 (file)
--- 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 79f01a30b3c1a15823986e2449cce2b020eed32a..1ff63cc6ae0bdfc720118ff0b05f4e64495a9ba4 100644 (file)
--- 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 8e48a4535faa857fbe8423a743539bf1d9badd16..c256c0480b9a0d1d0b9f8fc27b567f9d8af0e167 100644 (file)
--- 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 fa02bd32adbf6da8b266dc17ebbb204ebc0cb58f..8fe3eebb3462f5bd3a3906cb841075fc11b941c1 100644 (file)
--- 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 3d48d585f1c6a228edf1e25a731176822aed7222..df5d291c125018d96596706c1df93b99e2a4b179 100644 (file)
--- 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 f4a642c963a217917ddd2760f4407fcb30bee89f..03d1b0f76af8285763106392c5faaa214a5befcc 100644 (file)
--- 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 2fb39c1f7a89c1fcb426a2f9180a804be23bdd39..513e874bb9e31466a086a90c91a8d4d62aba3a77 100644 (file)
--- 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 8bd3157b2ffbc27382c277d1d4cfa87a3cc1dc63..7bf67f05270ca61257dd4a879c7c527ab95e1ca1 100644 (file)
--- 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 ed9b168e90e83be556cbc148af999bc02c08f284..d927a8652fcd6ed9e05af51a79b13374fb8cf1b6 100644 (file)
--- 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 808227f3aacd5330338993bd2a0cd6bc64fa84ab..2e593db379179290465bcc6b753308a5de0b808e 100644 (file)
--- 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 746ad6ed6416ba084ce83b07a11cba3827087760..67dfd9515eed21b82e8815703d45407e2302b6cf 100644 (file)
--- 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 ed244edc997a20f71c0f9c03ba72e5252adfb2f2..d92f2dcdf41e0b57809ba5554e54c6ec185e3a5a 100644 (file)
--- 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 1aaa7c7b2864aa96e246e6585c1ca67558c6683c..ef6530e383ea381d661a4b24f1ac3da1873335d0 100644 (file)
--- 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