Revert "Expand image name to include sec and ms"

Images coming online with the sec.ms patch seems to enter
error state. OpenStack the init of the nodes may not like
the "." dot in the VM name.

This reverts commit ce14f52380fd4b9dd707728d645aecf3d7a6d7fa.

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

diff --git a/templates/builder-aws.json b/templates/builder-aws.json
index 3b713cc..9a6b621 100644 (file)
--- a/templates/builder-aws.json
+++ b/templates/builder-aws.json
@@ -20,7 +20,7 @@
     {
       "name": "aws",
       "access_key": "{{user `aws_access_key`}}",
-      "ami_name": "ZZCI - {{user `distro`}} - builder-aws - {{isotime \"20060102-150405.000\"}}",
+      "ami_name": "ZZCI - {{user `distro`}} - builder-aws - {{isotime \"20060102-1504\"}}",
       "instance_type": "{{user `aws_instance_type`}}",
       "region": "{{user `aws_region`}}",
       "secret_key": "{{user `aws_secret_key`}}",

diff --git a/templates/builder.json b/templates/builder.json
index 8ac0cc2..7c4ce3f 100644 (file)
--- a/templates/builder.json
+++ b/templates/builder.json
@@ -15,7 +15,7 @@
   "builders": [
     {
       "name": "vexxhost",
-      "image_name": "ZZCI - {{user `distro`}} - builder - {{isotime \"20060102-150405.000\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - builder - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "identity_endpoint": "{{user `cloud_auth_url`}}",

diff --git a/templates/docker.json b/templates/docker.json
index 45f0289..01fe021 100644 (file)
--- a/templates/docker.json
+++ b/templates/docker.json
@@ -15,7 +15,7 @@
   "builders": [
     {
       "name": "vexxhost",
-      "image_name": "ZZCI - {{user `distro`}} - docker - {{isotime \"20060102-150405.000\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - docker - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "identity_endpoint": "{{user `cloud_auth_url`}}",