From a1b68848002d4abb47eb352110ecee81e739624e Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Sat, 19 May 2018 23:07:42 +1000 Subject: [PATCH] Expand rendered image name to include secs and ms The fix would avoid duplicate image names being created when we run the builder packer jobs on both releng and sandbox at the same time, and can potentially cause failures while removing them in builder openstack cron job. Creating images names timestamped upto ms reduces the probability of name collision. Change-Id: Ida0db499d3cdc376ab4c509614a90a8698925e0b Signed-off-by: Anil Belur --- packer/templates/devstack-pre-pip-ocata.json | 2 +- packer/templates/devstack-pre-pip-pike.json | 2 +- packer/templates/devstack-pre-pip-queens.json | 2 +- packer/templates/devstack.json | 2 +- packer/templates/gbp.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 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packer/templates/devstack-pre-pip-ocata.json b/packer/templates/devstack-pre-pip-ocata.json index 3fb4a0b9d..fa05d4216 100644 --- a/packer/templates/devstack-pre-pip-ocata.json +++ b/packer/templates/devstack-pre-pip-ocata.json @@ -23,7 +23,7 @@ "availability_zone": "ca-ymq-2", "ssh_username": "{{user `ssh_user`}}", "ssh_proxy_host": "{{user `ssh_proxy_host`}}", - "image_name": "ZZCI - {{user `distro`}} - devstack-ocata - {{isotime \"20060102-1504\"}}", + "image_name": "ZZCI - {{user `distro`}} - devstack-ocata - {{isotime \"20060102-150405.000\"}}", "source_image_name": "{{user `base_image`}}", "flavor": "v1-standard-1", "networks": [ diff --git a/packer/templates/devstack-pre-pip-pike.json b/packer/templates/devstack-pre-pip-pike.json index c33f502fc..8ced3564c 100644 --- a/packer/templates/devstack-pre-pip-pike.json +++ b/packer/templates/devstack-pre-pip-pike.json @@ -23,7 +23,7 @@ "availability_zone": "ca-ymq-2", "ssh_username": "{{user `ssh_user`}}", "ssh_proxy_host": "{{user `ssh_proxy_host`}}", - "image_name": "ZZCI - {{user `distro`}} - devstack-pike - {{isotime \"20060102-1504\"}}", + "image_name": "ZZCI - {{user `distro`}} - devstack-pike - {{isotime \"20060102-150405.000\"}}", "source_image_name": "{{user `base_image`}}", "flavor": "v1-standard-1", "networks": [ diff --git a/packer/templates/devstack-pre-pip-queens.json b/packer/templates/devstack-pre-pip-queens.json index 022e93c7e..4f8240eee 100644 --- a/packer/templates/devstack-pre-pip-queens.json +++ b/packer/templates/devstack-pre-pip-queens.json @@ -23,7 +23,7 @@ "availability_zone": "ca-ymq-2", "ssh_username": "{{user `ssh_user`}}", "ssh_proxy_host": "{{user `ssh_proxy_host`}}", - "image_name": "ZZCI - {{user `distro`}} - devstack-queens - {{isotime \"20060102-1504\"}}", + "image_name": "ZZCI - {{user `distro`}} - devstack-queens - {{isotime \"20060102-150405.000\"}}", "source_image_name": "{{user `base_image`}}", "flavor": "v1-standard-1", "networks": [ diff --git a/packer/templates/devstack.json b/packer/templates/devstack.json index fd4634c15..c8d31c44c 100644 --- a/packer/templates/devstack.json +++ b/packer/templates/devstack.json @@ -23,7 +23,7 @@ "availability_zone": "ca-ymq-2", "ssh_username": "{{user `ssh_user`}}", "ssh_proxy_host": "{{user `ssh_proxy_host`}}", - "image_name": "ZZCI - {{user `distro`}} - devstack - {{isotime \"20060102-1504\"}}", + "image_name": "ZZCI - {{user `distro`}} - devstack - {{isotime \"20060102-150405.000\"}}", "source_image_name": "{{user `base_image`}}", "flavor": "v1-standard-1", "networks": [ diff --git a/packer/templates/gbp.json b/packer/templates/gbp.json index 026c2eba8..632bea5d2 100644 --- a/packer/templates/gbp.json +++ b/packer/templates/gbp.json @@ -23,7 +23,7 @@ "availability_zone": "ca-ymq-2", "ssh_username": "{{user `ssh_user`}}", "ssh_proxy_host": "{{user `ssh_proxy_host`}}", - "image_name": "ZZCI - {{user `distro`}} - gbp - {{isotime \"20060102-1504\"}}", + "image_name": "ZZCI - {{user `distro`}} - gbp - {{isotime \"20060102-150405.000\"}}", "source_image_name": "{{user `base_image`}}", "flavor": "v1-standard-1", "networks": [ diff --git a/packer/templates/mininet-ovs-2.5.json b/packer/templates/mininet-ovs-2.5.json index 3433c09a5..3c7f9d170 100644 --- a/packer/templates/mininet-ovs-2.5.json +++ b/packer/templates/mininet-ovs-2.5.json @@ -23,7 +23,7 @@ "availability_zone": "ca-ymq-2", "ssh_username": "{{user `ssh_user`}}", "ssh_proxy_host": "{{user `ssh_proxy_host`}}", - "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-25 - {{isotime \"20060102-1504\"}}", + "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-25 - {{isotime \"20060102-150405.000\"}}", "source_image_name": "{{user `base_image`}}", "flavor": "v1-standard-1", "networks": [ diff --git a/packer/templates/mininet-ovs-2.6.json b/packer/templates/mininet-ovs-2.6.json index b6ec6998b..d0dd05a67 100644 --- a/packer/templates/mininet-ovs-2.6.json +++ b/packer/templates/mininet-ovs-2.6.json @@ -23,7 +23,7 @@ "availability_zone": "ca-ymq-2", "ssh_username": "{{user `ssh_user`}}", "ssh_proxy_host": "{{user `ssh_proxy_host`}}", - "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-26 - {{isotime \"20060102-1504\"}}", + "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-26 - {{isotime \"20060102-150405.000\"}}", "source_image_name": "{{user `base_image`}}", "flavor": "v1-standard-1", "networks": [ diff --git a/packer/templates/mininet-ovs-2.8.json b/packer/templates/mininet-ovs-2.8.json index 142d492e3..6e941d17b 100644 --- a/packer/templates/mininet-ovs-2.8.json +++ b/packer/templates/mininet-ovs-2.8.json @@ -14,7 +14,7 @@ "builders": [ { "name": "vexxhost", - "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-28 - {{isotime \"20060102-1504\"}}", + "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-28 - {{isotime \"20060102-150405.000\"}}", "source_image_name": "{{user `base_image`}}", "type": "openstack", "identity_endpoint": "{{user `cloud_auth_url`}}", diff --git a/packer/templates/robot.json b/packer/templates/robot.json index 33aa9f654..15b115ead 100644 --- a/packer/templates/robot.json +++ b/packer/templates/robot.json @@ -14,7 +14,7 @@ "builders": [ { "name": "vexxhost", - "image_name": "ZZCI - {{user `distro`}} - robot - {{isotime \"20060102-1504\"}}", + "image_name": "ZZCI - {{user `distro`}} - robot - {{isotime \"20060102-150405.000\"}}", "source_image_name": "{{user `base_image`}}", "type": "openstack", "identity_endpoint": "{{user `cloud_auth_url`}}", -- 2.36.6