Revert "Expand image name to include secs and ms"

Our packer build jobs are failing due to the patch. The
init scripts may no like the "." dot in the VM name.
We should revert.

This reverts commit a1b68848002d4abb47eb352110ecee81e739624e.

Change-Id: I3ce6f5ede4007299b8a1d7bf02383bf4331f3ff1
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/packer/templates/devstack-pre-pip-ocata.json b/packer/templates/devstack-pre-pip-ocata.json
index fa05d4216a454e71c829d1d1eb2f03b54ed36885..3fb4a0b9d01f21193507edd7c2b6ff6d12824fcd 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-150405.000\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - devstack-ocata - {{isotime \"20060102-1504\"}}",
       "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 8ced3564cc02024dca8954b0d934eb67a314ae0d..c33f502fca08aba64f1e5bf9a4234d5f73fa0a51 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-150405.000\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - devstack-pike - {{isotime \"20060102-1504\"}}",
       "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 4f8240eee9fc6e8967185ce7a92f22a0d55afabc..022e93c7ec4753d331fd9f7c7ae397404ca0ee0a 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-150405.000\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - devstack-queens - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [

diff --git a/packer/templates/devstack.json b/packer/templates/devstack.json
index c8d31c44c2833503f92421bffd18de314d798318..fd4634c15735abaeeec682920608cc8f28922b52 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-150405.000\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - devstack - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [

diff --git a/packer/templates/gbp.json b/packer/templates/gbp.json
index 632bea5d201c58b0b3b21b751cca1675eb48b8f1..026c2eba8c5036b156528748200d644f65d8d310 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-150405.000\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - gbp - {{isotime \"20060102-1504\"}}",
       "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 3c7f9d1701149757af4e40260545f77412820fe0..3433c09a5dc970fc706d4421594fe0a65cf890d3 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-150405.000\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-25 - {{isotime \"20060102-1504\"}}",
       "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 d0dd05a67af72abfce2e9bb58ae85a5f58b9a262..b6ec6998b0a92a426aa91458a0f2378019baef79 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-150405.000\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-26 - {{isotime \"20060102-1504\"}}",
       "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 6e941d17bb2e851a59a5108ad5d766dfc740fdff..142d492e3c2884d5ca8791815617b5d9c5466f59 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-150405.000\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-28 - {{isotime \"20060102-1504\"}}",
       "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 15b115eadf23bcd8b721c40acbe869f2816b0a36..33aa9f6547ebc637d11ea1c3e84a29afc941cfc8 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-150405.000\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - robot - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "identity_endpoint": "{{user `cloud_auth_url`}}",