Merge "ONAP test branch set to master"

diff --git a/jjb/airship/job_bml_master_integration_tests_centos.yml b/jjb/airship/job_bml_master_integration_tests_centos.yml
index 435eb913fd691406dc151a03027736755f6e9bb8..94ea23a620448c63c07f254cae09b160c70808a6 100644 (file)
--- a/jjb/airship/job_bml_master_integration_tests_centos.yml
+++ b/jjb/airship/job_bml_master_integration_tests_centos.yml
@@ -26,7 +26,7 @@
 
 - job-template:
     id: bml_master_integration_tests_centos
-    name: 'bml_master_integration_tests_centos'
+    name: '{job_prefix}_bml_master_integration_tests_centos'
     description: "K8s CAPIM3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on CentOS in Bare Metal Lab."
     project-type: pipeline
     defaults: global

diff --git a/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml b/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml
index 64be3f64191a64760e05d09b65dbba8d78db7232..d99a90547aa38e1411c1830733908e102ba9f4a2 100644 (file)
--- a/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml
+++ b/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml
@@ -26,7 +26,7 @@
 
 - job-template:
     id: capi_capm3_v1a5_master_e2e_tests_centos
-    name: '{job_prefix}_{name}_master_e2e_test_centos'
+    name: '{job_prefix}_master_e2e_test_centos'
     description: "CAPM3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on CentOS."
     project-type: pipeline
     defaults: global

diff --git a/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml b/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml
index 12c4673c305edb9a008256faac06084ff92a645a..6f8ce00c775a630e63d118fb5c2ae728ab97aafd 100644 (file)
--- a/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml
@@ -26,7 +26,7 @@
 
 - job-template:
     id: capi_capm3_v1a5_master_e2e_tests_ubuntu
-    name: '{job_prefix}_{name}_master_e2e_test_ubuntu'
+    name: '{job_prefix}_master_e2e_test_ubuntu'
     description: "CAPM3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on Ubuntu."
     project-type: pipeline
     defaults: global