From: Anil Belur Date: Thu, 14 Jun 2018 23:21:13 +0000 (+1000) Subject: Expand rendered image name to include secs and ms X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F12%2F73012%2F1;p=releng%2Fbuilder.git Expand rendered image name to include secs and ms Expand rendered image name to include seconds and milliseconds. This reduces the probability of image name collisions on the cloud from 1/60 to 1/60000. Fixed upstream in common-packer [1.]. [1.] https://gerrit.linuxfoundation.org/infra/#/c/10986/ https://jira.linuxfoundation.org/browse/RELENG-971 Change-Id: If8a808681be6e4dea942e6f928628e57f4f1090d Signed-off-by: Anil Belur --- diff --git a/packer/templates/devstack-pre-pip-ocata.json b/packer/templates/devstack-pre-pip-ocata.json index 3fb4a0b9d..418b2e19e 100644 --- a/packer/templates/devstack-pre-pip-ocata.json +++ b/packer/templates/devstack-pre-pip-ocata.json @@ -23,7 +23,8 @@ "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\"}}", + "instance_name": "{{user `distro`}}-devstack-ocata-{{uuid}}", "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 c33f502fc..97ae02430 100644 --- a/packer/templates/devstack-pre-pip-pike.json +++ b/packer/templates/devstack-pre-pip-pike.json @@ -23,7 +23,8 @@ "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\"}}", + "instance_name": "{{user `distro`}}-devstack-pike-{{uuid}}", "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 022e93c7e..864d7b6c7 100644 --- a/packer/templates/devstack-pre-pip-queens.json +++ b/packer/templates/devstack-pre-pip-queens.json @@ -23,7 +23,8 @@ "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\"}}", + "instance_name": "{{user `distro`}}-devstack-queens-{{uuid}}", "source_image_name": "{{user `base_image`}}", "flavor": "v1-standard-1", "networks": [ diff --git a/packer/templates/devstack.json b/packer/templates/devstack.json index fd4634c15..625ad3784 100644 --- a/packer/templates/devstack.json +++ b/packer/templates/devstack.json @@ -23,7 +23,8 @@ "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\"}}", + "instance_name": "{{user `distro`}}-devstack-{{uuid}}", "source_image_name": "{{user `base_image`}}", "flavor": "v1-standard-1", "networks": [ diff --git a/packer/templates/gbp.json b/packer/templates/gbp.json index 026c2eba8..3fc43e09b 100644 --- a/packer/templates/gbp.json +++ b/packer/templates/gbp.json @@ -23,7 +23,8 @@ "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\"}}", + "instance_name": "{{user `distro`}}-gbp-{{uuid}}", "source_image_name": "{{user `base_image`}}", "flavor": "v1-standard-1", "networks": [ diff --git a/packer/templates/kubernetes.json b/packer/templates/kubernetes.json index bce854de6..25823cd58 100644 --- a/packer/templates/kubernetes.json +++ b/packer/templates/kubernetes.json @@ -15,7 +15,8 @@ "builders": [ { "name": "vexxhost", - "image_name": "ZZCI - {{user `distro`}} - kubernetes - {{isotime \"20060102-1504\"}}", + "image_name": "ZZCI - {{user `distro`}} - kubernetes - {{isotime \"20060102-150405.000\"}}", + "instance_name": "{{user `distro`}}-kubernetes-{{uuid}}", "source_image_name": "{{user `base_image`}}", "type": "openstack", "identity_endpoint": "{{user `cloud_auth_url`}}", diff --git a/packer/templates/mininet-ovs-2.5.json b/packer/templates/mininet-ovs-2.5.json index 3433c09a5..e96ade7d7 100644 --- a/packer/templates/mininet-ovs-2.5.json +++ b/packer/templates/mininet-ovs-2.5.json @@ -23,7 +23,8 @@ "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\"}}", + "instance_name": "{{user `distro`}}-mininet-ovs-25-{{uuid}}", "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 b6ec6998b..86ddf455a 100644 --- a/packer/templates/mininet-ovs-2.6.json +++ b/packer/templates/mininet-ovs-2.6.json @@ -23,7 +23,8 @@ "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\"}}", + "instance_name": "{{user `distro`}}-mininet-ovs-26-{{uuid}}", "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 c79db5556..1f668dbe9 100644 --- a/packer/templates/mininet-ovs-2.8.json +++ b/packer/templates/mininet-ovs-2.8.json @@ -15,7 +15,8 @@ "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\"}}", + "instance_name": "{{user `distro`}}-mininet-ovs-28-{{uuid}}", "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 33a85ef03..cff9a0e1c 100644 --- a/packer/templates/robot.json +++ b/packer/templates/robot.json @@ -15,7 +15,8 @@ "builders": [ { "name": "vexxhost", - "image_name": "ZZCI - {{user `distro`}} - robot - {{isotime \"20060102-1504\"}}", + "image_name": "ZZCI - {{user `distro`}} - robot - {{isotime \"20060102-150405.000\"}}", + "instance_name": "{{user `distro`}}-robot-{{uuid}}", "source_image_name": "{{user `base_image`}}", "type": "openstack", "identity_endpoint": "{{user `cloud_auth_url`}}",