Merge "Change pipeline for e2e basic, integration, k8s-upgrade, ephemeral tests to...

diff --git a/jjb/metal3/job_ci_image_building.yml b/jjb/metal3/job_ci_image_building.yml
index cbbeead632c786a288716b6faec64cb54f8eec7c..a036f9445d5420cf582ba262c120f88ca3aae43f 100644 (file)
--- a/jjb/metal3/job_ci_image_building.yml
+++ b/jjb/metal3/job_ci_image_building.yml
@@ -60,5 +60,5 @@
           wipe-workspace: True
           honor-refspec: True
           shallow-clone: False
-      script-path: 'jenkins/jobs/{id}.pipeline'
+      script-path: "{image_building_pipeline}"
       lightweight-checkout: False

diff --git a/jjb/metal3/job_node_image_building.yml b/jjb/metal3/job_node_image_building.yml
index b3c6b6a8ac58bee3f5b6e6887285f1bcec110bbe..45388232483e056e4ff567c62df26263171ab351 100644 (file)
--- a/jjb/metal3/job_node_image_building.yml
+++ b/jjb/metal3/job_node_image_building.yml
@@ -77,5 +77,5 @@
           wipe-workspace: True
           honor-refspec: True
           shallow-clone: False
-      script-path: 'jenkins/jobs/{id}.pipeline'
+      script-path: "{image_building_pipeline}"
       lightweight-checkout: False