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 <abelur@linuxfoundation.org>

diff --git a/packer/templates/devstack-pre-pip-ocata.json b/packer/templates/devstack-pre-pip-ocata.json
index 3fb4a0b9d01f21193507edd7c2b6ff6d12824fcd..fa05d4216a454e71c829d1d1eb2f03b54ed36885 100644 (file)
--- 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 c33f502fca08aba64f1e5bf9a4234d5f73fa0a51..8ced3564cc02024dca8954b0d934eb67a314ae0d 100644 (file)
--- 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 022e93c7ec4753d331fd9f7c7ae397404ca0ee0a..4f8240eee9fc6e8967185ce7a92f22a0d55afabc 100644 (file)
--- 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 fd4634c15735abaeeec682920608cc8f28922b52..c8d31c44c2833503f92421bffd18de314d798318 100644 (file)
--- 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 026c2eba8c5036b156528748200d644f65d8d310..632bea5d201c58b0b3b21b751cca1675eb48b8f1 100644 (file)
--- 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 3433c09a5dc970fc706d4421594fe0a65cf890d3..3c7f9d1701149757af4e40260545f77412820fe0 100644 (file)
--- 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 b6ec6998b0a92a426aa91458a0f2378019baef79..d0dd05a67af72abfce2e9bb58ae85a5f58b9a262 100644 (file)
--- 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 142d492e3c2884d5ca8791815617b5d9c5466f59..6e941d17bb2e851a59a5108ad5d766dfc740fdff 100644 (file)
--- 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 33aa9f6547ebc637d11ea1c3e84a29afc941cfc8..15b115eadf23bcd8b721c40acbe869f2816b0a36 100644 (file)
--- 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`}}",