Metal3: Add 'daily' keyword in main job names to better differentiate them from PR jobs.
Change-Id: Iffdc8034f26b5ef46a3dd612b19d334a94a4d120
diff --git a/jjb/metal3/job_bml_main_integration_tests.yml b/jjb/metal3/job_bml_main_integration_tests.yml
index 51c8f9c..aa2b39c 100644
--- 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 d6cb477..d508be6 100644
--- 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 a124003..6749379 100644
--- 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 4dea33c..0799346 100644
--- 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 f0f8a1e..19bf5f3 100644
--- 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 7827fb6..fc25627 100644
--- 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 03d1b0f..2ad3fa4 100644
--- 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 8205678..e166a7d 100644
--- 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 27a39d6..3fa39be 100644
--- 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 2fc887f..f468257 100644
--- 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 0859eab..0e2dc00 100644
--- 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