Rename JJB job to include Ironic image building step

Change-Id: I92924e88c7a9bd4a66e7db84b40903a8742d281d

diff --git a/jjb/airship/job_ipa_image_building.yml b/jjb/airship/job_ipa_image_building.yml
index 0f6a7df97df1e3ae5dd0460b40d566b9bd962e9c..589d16b3b9ebb67b8411c8a6011d260b06ba4685 100644 (file)
--- a/jjb/airship/job_ipa_image_building.yml
+++ b/jjb/airship/job_ipa_image_building.yml
@@ -25,9 +25,9 @@
 # The pipeline scripts are maintained in Nordix/airship-dev-tools repository.
 
 - job-template:
-    id: openstack_ipa_image_building
-    name: '{job_prefix}_openstack_ipa_image_building'
-    description: "Builder job for Openstack IPA images for metal3 CI"
+    id: openstack_ipa_and_ironic_image_building
+    name: '{job_prefix}_openstack_ipa_and_ironic_image_building'
+    description: "IPA and Ironic image building"
     project-type: pipeline
     defaults: global
     disabled: False

diff --git a/jjb/airship/job_ipa_image_building_test.yml b/jjb/airship/job_ipa_image_building_test.yml
index 74256311f34ccdf45952801b1fc27f6a6298b0b3..013542a47fd553ffc2a338ed44505584609e8556 100644 (file)
--- a/jjb/airship/job_ipa_image_building_test.yml
+++ b/jjb/airship/job_ipa_image_building_test.yml
@@ -25,9 +25,9 @@
 # The pipeline scripts are maintained in Nordix/airship-dev-tools repository.
 
 - job-template:
-    id: metal3_ipa_image_building_test_centos
-    name: '{job_prefix}_ipa_image_building_test_centos'
-    description: "Metal3 IPA image building integration test for {repo[org]}/{repo[name]} on Centos. "
+    id: metal3_ipa_and_ironic_image_building_test_centos
+    name: '{job_prefix}_openstack_ipa_and_ironic_image_building_centos'
+    description: "IPA and Ironic image building test on Centos."
     project-type: pipeline
     defaults: global
     disabled: False
@@ -96,5 +96,5 @@
           wipe-workspace: True
           honor-refspec: True
           shallow-clone: False
-      script-path: "ci/jobs/openstack_ipa_image_building.pipeline"
+      script-path: "ci/jobs/openstack_ipa_and_ironic_image_building.pipeline"
       lightweight-checkout: False

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index b27c7f6b6af4c023824b8e0ee93ddf1fdbcc7806..052c188a094e9deba9dbe77482bc0259089ed32e 100644 (file)
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -38,8 +38,8 @@
     - update_nordix_artifacts
     - update_nordix_repos
     - openstack_node_image_building
-    - openstack_ipa_image_building
-    - metal3_ipa_image_building_test_centos
+    - openstack_ipa_and_ironic_image_building
+    - metal3_ipa_and_ironic_image_building_test_centos
     repo:
       org: "Nordix"
       name: "airship-dev-tools"