From ddab9dafec39247aed28fbe809dd011c6b27511c Mon Sep 17 00:00:00 2001 From: Andrew Grimberg Date: Sat, 23 Jan 2021 13:54:41 +1000 Subject: [PATCH] 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 --- global-jjb | 2 +- packer/common-packer | 2 +- packer/templates/builder.json | 2 +- packer/templates/devstack-pre-pip-queens.json | 2 +- packer/templates/devstack-pre-pip-rocky.json | 2 +- packer/templates/devstack-pre-pip-stein.json | 2 +- packer/templates/devstack.json | 2 +- packer/templates/mininet-ovs-2.5.json | 2 +- packer/templates/mininet-ovs-2.6.json | 2 +- packer/templates/mininet-ovs-2.8.json | 2 +- packer/templates/robot.json | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/global-jjb b/global-jjb index e0a9d10d3..b0de8e76b 160000 --- 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 cc035619a..38f810974 160000 --- 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 303273d06..d635dacbe 100644 --- 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 1ec808e38..89d2b6e4b 100644 --- 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 c2b24b85c..c976afc23 100644 --- 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 df2557650..bf6f91c2f 100644 --- 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 5847ad81d..178dd022b 100644 --- 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 908286aa7..6b46057d1 100644 --- 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 7855df992..493541bce 100644 --- 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 e7e625769..c8412343f 100644 --- 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 89d076ffa..ccdb6ff48 100644 --- 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`}}", -- 2.36.6