From 94428bc3b60e1751fcffa1ed979d280ef987d14c Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 3 Jun 2021 19:31:04 +1000 Subject: [PATCH] CI: Update common-packer to the latest v0.8.0 - Add support for Docker builder in common-packer v0.8.0 requires updates to the builder templates files. - Update global-jjb to the latest v0.64.0. Change-Id: I8f94b090f854a864aa16499c2f77287debcec804 Signed-off-by: Anil Belur --- global-jjb | 2 +- packer/common-packer | 2 +- packer/templates/builder.json | 8 ++++++++ packer/templates/devstack-pre-pip-queens.json | 7 +++++++ packer/templates/devstack-pre-pip-rocky.json | 17 +++++++++++++--- packer/templates/devstack-pre-pip-stein.json | 8 ++++++++ packer/templates/devstack.json | 8 ++++++++ packer/templates/helm.json | 20 +++++++++++++++++-- packer/templates/mininet-ovs-2.8.json | 8 ++++++++ packer/templates/robot.json | 8 ++++++++ 10 files changed, 81 insertions(+), 7 deletions(-) diff --git a/global-jjb b/global-jjb index 5beb455864..c8b9acd166 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit 5beb45586451cb772982de881cd09fd97360be87 +Subproject commit c8b9acd166fcbd88139a65f7721e522980a0e013 diff --git a/packer/common-packer b/packer/common-packer index 3494343faf..4055df4c0f 160000 --- a/packer/common-packer +++ b/packer/common-packer @@ -1 +1 @@ -Subproject commit 3494343faf0fc4221bfdb6cefc8bc0af0452f980 +Subproject commit 4055df4c0fcdde29b12572ede98d86c8f0216ff5 diff --git a/packer/templates/builder.json b/packer/templates/builder.json index dedef637e0..ed13e01667 100644 --- a/packer/templates/builder.json +++ b/packer/templates/builder.json @@ -10,6 +10,7 @@ "vm_volume_size": "20", "vm_image_disk_format": "", "distro": null, + "docker_source_image": null, "flavor": "v3-standard-2", "ssh_user": null, "ssh_proxy_host": "" @@ -33,6 +34,13 @@ "use_blockstorage_volume": "{{user `vm_use_block_storage`}}", "volume_size": "{{user `vm_volume_size`}}", "image_disk_format": "{{user `vm_image_disk_format`}}" + }, + { + "name": "docker", + "type": "docker", + "image": "{{ user `docker_source_image` }}", + "commit": true, + "changes": ["ENTRYPOINT [\"\"]", "CMD [\"\"]"] } ], "provisioners": [ diff --git a/packer/templates/devstack-pre-pip-queens.json b/packer/templates/devstack-pre-pip-queens.json index b9274cf380..23214fe85f 100644 --- a/packer/templates/devstack-pre-pip-queens.json +++ b/packer/templates/devstack-pre-pip-queens.json @@ -33,6 +33,13 @@ "use_blockstorage_volume": "{{user `vm_use_block_storage`}}", "volume_size": "{{user `vm_volume_size`}}", "image_disk_format": "{{user `vm_image_disk_format`}}" + }, + { + "name": "docker", + "type": "docker", + "image": "{{ user `docker_source_image` }}", + "commit": true, + "changes": ["ENTRYPOINT [\"\"]", "CMD [\"\"]"] } ], "provisioners": [ diff --git a/packer/templates/devstack-pre-pip-rocky.json b/packer/templates/devstack-pre-pip-rocky.json index 2da9b1992a..a16ac897aa 100644 --- a/packer/templates/devstack-pre-pip-rocky.json +++ b/packer/templates/devstack-pre-pip-rocky.json @@ -10,6 +10,7 @@ "vm_volume_size": "20", "vm_image_disk_format": "", "distro": null, + "docker_source_image": null, "flavor": "v3-standard-2", "ssh_user": null, "ssh_proxy_host": "" @@ -21,15 +22,25 @@ "instance_name": "{{user `distro`}}-devstack-rocky-{{uuid}}", "source_image_name": "{{user `base_image`}}", "type": "openstack", - "region": "ca-ymq-1", + "region": "{{user `cloud_region`}}", "networks": ["{{user `cloud_network`}}"], "user_data_file": "{{user `cloud_user_data`}}", "ssh_username": "{{user `ssh_user`}}", "ssh_proxy_host": "{{user `ssh_proxy_host`}}", - "flavor": "v3-standard-2", + "flavor": "{{user `flavor`}}", "metadata": { "ci_managed": "yes" - } + }, + "use_blockstorage_volume": "{{user `vm_use_block_storage`}}", + "volume_size": "{{user `vm_volume_size`}}", + "image_disk_format": "{{user `vm_image_disk_format`}}" + }, + { + "name": "docker", + "type": "docker", + "image": "{{ user `docker_source_image` }}", + "commit": true, + "changes": ["ENTRYPOINT [\"\"]", "CMD [\"\"]"] } ], "provisioners": [ diff --git a/packer/templates/devstack-pre-pip-stein.json b/packer/templates/devstack-pre-pip-stein.json index 839a69df04..f689b44126 100644 --- a/packer/templates/devstack-pre-pip-stein.json +++ b/packer/templates/devstack-pre-pip-stein.json @@ -10,6 +10,7 @@ "vm_volume_size": "20", "vm_image_disk_format": "", "distro": null, + "docker_source_image": null, "flavor": "v3-standard-2", "ssh_user": null, "ssh_proxy_host": "" @@ -33,6 +34,13 @@ "use_blockstorage_volume": "{{user `vm_use_block_storage`}}", "volume_size": "{{user `vm_volume_size`}}", "image_disk_format": "{{user `vm_image_disk_format`}}" + }, + { + "name": "docker", + "type": "docker", + "image": "{{ user `docker_source_image` }}", + "commit": true, + "changes": ["ENTRYPOINT [\"\"]", "CMD [\"\"]"] } ], "provisioners": [ diff --git a/packer/templates/devstack.json b/packer/templates/devstack.json index 0e6382882e..c5ca7d4a70 100644 --- a/packer/templates/devstack.json +++ b/packer/templates/devstack.json @@ -10,6 +10,7 @@ "vm_volume_size": "20", "vm_image_disk_format": "", "distro": null, + "docker_source_image": null, "flavor": "v3-standard-2", "ssh_user": null, "ssh_proxy_host": "" @@ -33,6 +34,13 @@ "use_blockstorage_volume": "{{user `vm_use_block_storage`}}", "volume_size": "{{user `vm_volume_size`}}", "image_disk_format": "{{user `vm_image_disk_format`}}" + }, + { + "name": "docker", + "type": "docker", + "image": "{{ user `docker_source_image` }}", + "commit": true, + "changes": ["ENTRYPOINT [\"\"]", "CMD [\"\"]"] } ], "provisioners": [ diff --git a/packer/templates/helm.json b/packer/templates/helm.json index cd5ebaa9b0..48a2a1b343 100644 --- a/packer/templates/helm.json +++ b/packer/templates/helm.json @@ -1,6 +1,7 @@ { "variables": { "ansible_roles_path": ".galaxy", + "arch": "x86_64", "base_image": null, "distro": null, "cloud_auth_url": null, @@ -9,8 +10,13 @@ "cloud_network": null, "cloud_tenant": null, "cloud_user_data": null, + "cloud_region": "ca-ymq-1", + "docker_source_image": null, + "flavor": "v3-standard-2", "ssh_user": null, - "ssh_proxy_host": "" + "ssh_proxy_host": "", + "vm_use_block_storage": "true", + "vm_volume_size": "20" }, "builders": [ { @@ -33,7 +39,17 @@ "flavor": "v1-standard-1", "metadata": { "ci_managed": "yes" - } + }, + "use_blockstorage_volume": "{{user `vm_use_block_storage`}}", + "volume_size": "{{user `vm_volume_size`}}", + "image_disk_format": "{{user `vm_image_disk_format`}}" + }, + { + "name": "docker", + "type": "docker", + "image": "{{ user `docker_source_image` }}", + "commit": true, + "changes": ["ENTRYPOINT [\"\"]", "CMD [\"\"]"] } ], "provisioners": [ diff --git a/packer/templates/mininet-ovs-2.8.json b/packer/templates/mininet-ovs-2.8.json index 61f0677b31..544c685b90 100644 --- a/packer/templates/mininet-ovs-2.8.json +++ b/packer/templates/mininet-ovs-2.8.json @@ -10,6 +10,7 @@ "vm_volume_size": "20", "vm_image_disk_format": "", "distro": null, + "docker_source_image": null, "flavor": "v3-standard-2", "ssh_user": null, "ssh_proxy_host": "" @@ -33,6 +34,13 @@ "use_blockstorage_volume": "{{user `vm_use_block_storage`}}", "volume_size": "{{user `vm_volume_size`}}", "image_disk_format": "{{user `vm_image_disk_format`}}" + }, + { + "name": "docker", + "type": "docker", + "image": "{{ user `docker_source_image` }}", + "commit": true, + "changes": ["ENTRYPOINT [\"\"]", "CMD [\"\"]"] } ], "provisioners": [ diff --git a/packer/templates/robot.json b/packer/templates/robot.json index f0cdddd0fc..fb28e691b3 100644 --- a/packer/templates/robot.json +++ b/packer/templates/robot.json @@ -10,6 +10,7 @@ "vm_volume_size": "20", "vm_image_disk_format": "", "distro": null, + "docker_source_image": null, "flavor": "v3-standard-2", "ssh_user": null, "ssh_proxy_host": "" @@ -33,6 +34,13 @@ "use_blockstorage_volume": "{{user `vm_use_block_storage`}}", "volume_size": "{{user `vm_volume_size`}}", "image_disk_format": "{{user `vm_image_disk_format`}}" + }, + { + "name": "docker", + "type": "docker", + "image": "{{ user `docker_source_image` }}", + "commit": true, + "changes": ["ENTRYPOINT [\"\"]", "CMD [\"\"]"] } ], "provisioners": [ -- 2.36.6