Metal3: Add 'daily' keyword in main job names to better differentiate them from PR...

Change-Id: Iffdc8034f26b5ef46a3dd612b19d334a94a4d120

diff --git a/jjb/metal3/job_bml_main_integration_tests.yml b/jjb/metal3/job_bml_main_integration_tests.yml
index 51c8f9c05b3b4b8a71b86c1f1184b12d5c3b280c..aa2b39c5a2ad1f4a7257572f9ced9a1bdbb12b77 100644 (file)
--- a/jjb/metal3/job_bml_main_integration_tests.yml
+++ b/jjb/metal3/job_bml_main_integration_tests.yml
@@ -27,7 +27,7 @@
 
 - job-template:
     id: bml_main_integration_tests
-    name: '{job_prefix}_main_bml_integration_tests_{image_os}'
+    name: '{job_prefix}_daily_main_bml_integration_tests_{image_os}'
     description: "CAPM3 v1beta1 main integration tests for {org}/{repo} on {image_os} in Bare Metal Lab."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_capm3_e2e_upgrade_tests.yml b/jjb/metal3/job_capm3_e2e_upgrade_tests.yml
index d6cb47790260d43ab9a2f12b7a64bc2fd8336a6b..d508be64e295c1d36bb30d99b4504ad81e4bd2fc 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_upgrade_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_upgrade_tests.yml
@@ -26,7 +26,7 @@
 
 - job-template:
     id: capm3_e2e_upgrade_tests
-    name: '{job_prefix}_{proj}_v1b1_e2e_upgrade_test_{image_os}'
+    name: '{job_prefix}_{proj}_main_e2e_upgrade_test_{image_os}'
     description: "CAPM3 e2e upgrade tests for {org}/{repo} on {image_os}."
     project-type: pipeline
     defaults: global
@@ -94,7 +94,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-main-upgrade-e2e(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/test-upgrade-e2e-main(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
@@ -103,7 +103,7 @@
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'main'
-        status-context: "test-main-upgrade-e2e"
+        status-context: "test-upgrade-e2e-main"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"

diff --git a/jjb/metal3/job_capm3_e2e_ephemeral_tests.yml b/jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml
similarity index 98%
rename from jjb/metal3/job_capm3_e2e_ephemeral_tests.yml
rename to jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml
index a124003d5d890904bac596bebeb6dc92b4d307c8..6749379353b5d073cd593bfe24b6437ac379c34d 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_ephemeral_tests.yml
+++ b/jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml
@@ -26,7 +26,7 @@
 
 - job-template:
     id: capm3_main_e2e_ephemeral_tests
-    name: '{job_prefix}_main_e2e_ephemeral_test_{image_os}'
+    name: '{job_prefix}_daily_main_e2e_ephemeral_test_{image_os}'
     description: "CAPM3 v1beta1 e2e tests in ephemeral cluster for {repo[org]}/{repo[name]} on centos."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_capm3_main_e2e_tests.yml b/jjb/metal3/job_capm3_main_e2e_tests.yml
index 4dea33c677b60ddf67778c1e59e763fe015b3eff..0799346b5105af5a2ac56e44a67ff9ce972a6a53 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_tests.yml
+++ b/jjb/metal3/job_capm3_main_e2e_tests.yml
@@ -26,7 +26,7 @@
 
 - job-template:
     id: capm3_main_e2e_tests
-    name: '{job_prefix}_main_{capm3_target_branch}_e2e_test_{image_os}'
+    name: '{job_prefix}_daily_{capm3_target_branch}_e2e_test_{image_os}'
     description: "CAPM3 {capm3_version} e2e tests for {repo[org]}/{repo[name]} on {image_os}."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_capm3_main_e2e_upgrade_tests.yml b/jjb/metal3/job_capm3_main_e2e_upgrade_tests.yml
index f0f8a1eaa7468b3cb13c2658d2078168a9edac26..19bf5f3e5444a08ae95d8490eec7d8f33e0ecc5f 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_upgrade_tests.yml
+++ b/jjb/metal3/job_capm3_main_e2e_upgrade_tests.yml
@@ -26,7 +26,7 @@
 
 - job-template:
     id: capm3_main_e2e_upgrade_tests
-    name: '{job_prefix}_main_e2e_upgrade_test_{image_os}'
+    name: '{job_prefix}_daily_main_e2e_upgrade_test_{image_os}'
     description: "CAPM3 v1alpha5 to v1beta1 e2e upgrade tests for {repo[org]}/{repo[name]} on ubuntu."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_capm3_main_integration_tests.yml b/jjb/metal3/job_capm3_main_integration_tests.yml
index 7827fb6bbccf69839c5ddb91b226cbea49181626..fc25627e664c3526ee90d17c881a545889ed3541 100644 (file)
--- a/jjb/metal3/job_capm3_main_integration_tests.yml
+++ b/jjb/metal3/job_capm3_main_integration_tests.yml
@@ -26,7 +26,7 @@
 
 - job-template:
     id: capm3_main_integration_tests
-    name: '{job_prefix}_main_{capm3_target_branch}_integration_test_{image_os}'
+    name: '{job_prefix}_daily_{capm3_target_branch}_integration_test_{image_os}'
     description: "CAPM3 {capm3_version} integration tests for {org}/{repo} on {image_os}."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_main_clean.yml b/jjb/metal3/job_main_clean.yml
index 03d1b0f76af8285763106392c5faaa214a5befcc..2ad3fa4fd70128d889e888c4dcc194a976e0a4ea 100644 (file)
--- a/jjb/metal3/job_main_clean.yml
+++ b/jjb/metal3/job_main_clean.yml
@@ -27,7 +27,7 @@
 
 - job-template:
     id: main_clean
-    name: '{job_prefix}_main_integration_tests_cleanup'
+    name: '{job_prefix}_daily_main_integration_tests_cleanup'
     description: "CAPM3 integration tests cleanup"
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_main_feature_tests.yml b/jjb/metal3/job_main_feature_tests.yml
index 82056784aa874dd385a951c17d683e60d8f13ee5..e166a7d5ff8dcc2f957bddcf83456770452aaf8d 100644 (file)
--- a/jjb/metal3/job_main_feature_tests.yml
+++ b/jjb/metal3/job_main_feature_tests.yml
@@ -27,7 +27,7 @@
 
 - job-template:
     id: main_feature_tests
-    name: '{job_prefix}_main_feature_tests_{image_os}'
+    name: '{job_prefix}_daily_main_feature_tests_{image_os}'
     description: "Inspection, remediation, pivoting, node reuse and repivoting main feature tests on {image_os}."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_main_feature_tests_upgrade.yml b/jjb/metal3/job_main_feature_tests_upgrade.yml
index 27a39d6959317d70491e4765ce906b4f1eb6ef14..3fa39bee7204db00052faa5d10e5177858fdadb9 100644 (file)
--- a/jjb/metal3/job_main_feature_tests_upgrade.yml
+++ b/jjb/metal3/job_main_feature_tests_upgrade.yml
@@ -27,7 +27,7 @@
 
 - job-template:
     id: main_feature_tests_upgrade
-    name: '{job_prefix}_main_feature_tests_upgrade_{image_os}'
+    name: '{job_prefix}_daily_main_feature_tests_upgrade_{image_os}'
     description: "Upgrade main tests on {image_os}."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_main_ipa_image_building.yml b/jjb/metal3/job_main_ipa_image_building.yml
index 2fc887f11059145c9c9bd4754402df72433ea8e6..f468257fb93f7b54b50dd59a19a2fd0814fc4868 100644 (file)
--- a/jjb/metal3/job_main_ipa_image_building.yml
+++ b/jjb/metal3/job_main_ipa_image_building.yml
@@ -26,7 +26,7 @@
 
 - job-template:
     id: main_openstack_ipa_and_ironic_image_building
-    name: '{job_prefix}_main_openstack_ipa_and_ironic_image_building'
+    name: '{job_prefix}_daily_main_openstack_ipa_and_ironic_image_building'
     description: "IPA and Ironic image building"
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 0859eab49f5c0dfb77b594e0c7fe53d45ec61945..0e2dc00b61f03eb6519b9fb78c945cf35d9845b7 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -76,6 +76,8 @@
           repo: ironic-image
       - ironic_ipa_downloader:
           repo: ironic-ipa-downloader
+      -  mariadb-image:
+          repo: mariadb-image
     image_os:
       - ubuntu
       - centos