Set builder name and type to "openstack"

Based on the input provided on the Gihub packer issue
hard-coded for our parser to be able to decode the rest of the config
properly." This would require to hardcode the builder name and type
in the templates.

This change requires an update in global-jjb v0.60.3
and common-packer v0.7.4.

Change-Id: I9c9802356dce03a4b60e38b96d1f7e6b0e0813e5
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/global-jjb b/global-jjb
index e0a9d10d3d6b488ed3a3b00050b34d9faee4a6f8..b0de8e76ba8c4e2cacbef206d7864e856b1ffc1d 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit e0a9d10d3d6b488ed3a3b00050b34d9faee4a6f8
+Subproject commit b0de8e76ba8c4e2cacbef206d7864e856b1ffc1d

diff --git a/packer/common-packer b/packer/common-packer
index cc035619ac1673a5b5ea2f6bfb843eac75ea4a9d..38f810974c2fdb9b4eb998b5efee93362904cced 160000 (submodule)
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit cc035619ac1673a5b5ea2f6bfb843eac75ea4a9d
+Subproject commit 38f810974c2fdb9b4eb998b5efee93362904cced

diff --git a/packer/templates/builder.json b/packer/templates/builder.json
index 303273d0699024f1f3222ae9875bef304202a52c..d635dacbea500b6974da5d38f880a63fe485f0b0 100644 (file)
--- a/packer/templates/builder.json
+++ b/packer/templates/builder.json
@@ -16,7 +16,7 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - builder - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-builder-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",

diff --git a/packer/templates/devstack-pre-pip-queens.json b/packer/templates/devstack-pre-pip-queens.json
index 1ec808e383cf60f784fec55092eee4dad8619da7..89d2b6e4b4d29df92b4e8fd65cb8f61710887b56 100644 (file)
--- a/packer/templates/devstack-pre-pip-queens.json
+++ b/packer/templates/devstack-pre-pip-queens.json
@@ -16,7 +16,7 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - devstack-queens - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-devstack-queens-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",

diff --git a/packer/templates/devstack-pre-pip-rocky.json b/packer/templates/devstack-pre-pip-rocky.json
index c2b24b85c0328ffd090f2dcf6217dacca97cd6a3..c976afc234ec711557e5621659414e0a82372bcf 100644 (file)
--- a/packer/templates/devstack-pre-pip-rocky.json
+++ b/packer/templates/devstack-pre-pip-rocky.json
@@ -16,7 +16,7 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - devstack-rocky - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-devstack-rocky-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",

diff --git a/packer/templates/devstack-pre-pip-stein.json b/packer/templates/devstack-pre-pip-stein.json
index df2557650a2bc6eb56b36eec9666926cef2210fe..bf6f91c2f24d7ef57778da4b86bbfc7020c260a2 100644 (file)
--- a/packer/templates/devstack-pre-pip-stein.json
+++ b/packer/templates/devstack-pre-pip-stein.json
@@ -16,7 +16,7 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - devstack-stein - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-devstack-stein-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",

diff --git a/packer/templates/devstack.json b/packer/templates/devstack.json
index 5847ad81da52508d98eb50a21fae224fdb73171b..178dd022b5c4abc15fabd80a1a2ee01501574b12 100644 (file)
--- a/packer/templates/devstack.json
+++ b/packer/templates/devstack.json
@@ -16,7 +16,7 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - devstack - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-devstack-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",

diff --git a/packer/templates/mininet-ovs-2.5.json b/packer/templates/mininet-ovs-2.5.json
index 908286aa7163cc76552a3150e8284ca036a41a90..6b46057d1a553d34a1db81be3a0ea91c719e7ef3 100644 (file)
--- a/packer/templates/mininet-ovs-2.5.json
+++ b/packer/templates/mininet-ovs-2.5.json
@@ -16,7 +16,7 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-25 - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-mininet-ovs-25-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",

diff --git a/packer/templates/mininet-ovs-2.6.json b/packer/templates/mininet-ovs-2.6.json
index 7855df992427a54f02ef7a6c9c16872513d79dc2..493541bce843e80a8f38f80ccb82c014264c334a 100644 (file)
--- a/packer/templates/mininet-ovs-2.6.json
+++ b/packer/templates/mininet-ovs-2.6.json
@@ -16,7 +16,7 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-26 - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-mininet-ovs-26-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",

diff --git a/packer/templates/mininet-ovs-2.8.json b/packer/templates/mininet-ovs-2.8.json
index e7e625769819254cbd0af81183d3c2e37a36a07e..c8412343f8ef4b8c0fd40bb6e00e6c54bdd2f88e 100644 (file)
--- a/packer/templates/mininet-ovs-2.8.json
+++ b/packer/templates/mininet-ovs-2.8.json
@@ -16,7 +16,7 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-28 - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-mininet-ovs-28-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",

diff --git a/packer/templates/robot.json b/packer/templates/robot.json
index 89d076ffa38fd0faccb6724319176034b132962d..ccdb6ff48e95eb077c18243fd1417cf501f8a3ea 100644 (file)
--- a/packer/templates/robot.json
+++ b/packer/templates/robot.json
@@ -16,7 +16,7 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - robot - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-robot-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",