Merge "Renaming of the BulkPMSuite to usecases 5Gbulkpm"

diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index 450355f..9fff285 100644 (file)
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -15,7 +15,7 @@
     lftools-version: <1.0.0
 
     # packer_version
-    packer-version: 1.1.3
+    packer-version: 1.3.1
 
     # default gerrit server definition
     server-name: 'Primary'

diff --git a/packer/templates/helm.json b/packer/templates/helm.json
index b34ce9f..51a151c 100644 (file)
--- 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 ad4bc80..dd1227a 100644 (file)
--- 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 20422f6..2b3c03f 100644 (file)
--- 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 @@
     }
   ]
 }
-