summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnil Belur <abelur@linuxfoundation.org>2018-09-27 16:50:37 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-27 16:50:37 +0000
commitc116655f4875826a25aa377ea536ad4e0f060c84 (patch)
tree44dd59f45050a99345430df93454d2a96bfb41d5
parentd9334ed810a115cac6da8cab08282cc9e80cfbce (diff)
parenta108f101c2df69804be4631e0854c70e82af5b67 (diff)
Merge "Expand rendered image name to include sec and ms"
-rw-r--r--packer/templates/helm.json3
-rw-r--r--packer/templates/memcached.json2
-rw-r--r--packer/templates/redis.json3
3 files changed, 4 insertions, 4 deletions
diff --git a/packer/templates/helm.json b/packer/templates/helm.json
index b34ce9f83..51a151cbf 100644
--- a/packer/templates/helm.json
+++ b/packer/templates/helm.json
@@ -15,7 +15,8 @@
"builders": [
{
"name": "vexxhost",
- "image_name": "ZZCI - {{user `distro`}} - helm - {{isotime \"20060102-1504\"}}",
+ "image_name": "ZZCI - {{user `distro`}} - helm - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
+ "instance_name": "{{user `distro`}}-builder-{{uuid}}",
"source_image_name": "{{user `base_image`}}",
"type": "openstack",
"identity_endpoint": "{{user `cloud_auth_url`}}",
diff --git a/packer/templates/memcached.json b/packer/templates/memcached.json
index ad4bc805a..dd1227ac3 100644
--- a/packer/templates/memcached.json
+++ b/packer/templates/memcached.json
@@ -15,7 +15,7 @@
"builders": [
{
"name": "vexxhost",
- "image_name": "{{user `distro`}} - memcached - {{isotime \"20171102-0135\"}}",
+ "image_name": "{{user `distro`}} - memcached - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
"source_image_name": "{{user `base_image`}}",
"type": "openstack",
"identity_endpoint": "{{user `cloud_auth_url`}}",
diff --git a/packer/templates/redis.json b/packer/templates/redis.json
index 20422f677..2b3c03f92 100644
--- a/packer/templates/redis.json
+++ b/packer/templates/redis.json
@@ -15,7 +15,7 @@
"builders": [
{
"name": "vexxhost",
- "image_name": "{{user `distro`}} - redis - {{isotime \"20060102-1504\"}}",
+ "image_name": "{{user `distro`}} - redis - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
"source_image_name": "{{user `base_image`}}",
"type": "openstack",
"identity_endpoint": "{{user `cloud_auth_url`}}",
@@ -62,4 +62,3 @@
}
]
}
-