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 <abelur@linuxfoundation.org>

diff --git a/global-jjb b/global-jjb
index 5beb45586451cb772982de881cd09fd97360be87..c8b9acd166fcbd88139a65f7721e522980a0e013 160000 (submodule)
--- 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 3494343faf0fc4221bfdb6cefc8bc0af0452f980..4055df4c0fcdde29b12572ede98d86c8f0216ff5 160000 (submodule)
--- 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 dedef637e03facd20e6673d82e0fd01294566f9b..ed13e01667d931b50ac62cb2dfee7a7b1fd6c772 100644 (file)
--- 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 b9274cf380f261683e6a96a4e3521edad0df86f2..23214fe85f5c258563fded8ab08e24186c52069f 100644 (file)
--- 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 2da9b1992a32ecfd6b1a23d6c014acb7f474fc3c..a16ac897aacd74285beba21ccc415e9469e76640 100644 (file)
--- 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 839a69df0406710c440a39771fded4ddc85e8d03..f689b44126435a749ff6076eab08df5097d4f316 100644 (file)
--- 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 0e6382882eb1c16bca4fba0f66095d7f97b20ee3..c5ca7d4a701a855085fbf1482539e262d212d562 100644 (file)
--- 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 cd5ebaa9b0fc16caecac929a6c608186ef906919..48a2a1b34399bce32bc12efad9f6cb9ea9dead00 100644 (file)
--- 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 61f0677b31dc428249c1d6008861bea670ed3c5e..544c685b9094856863f1afa97804d2e0fb262eeb 100644 (file)
--- 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 f0cdddd0fcdb404f01f7ee4186864821233e5989..fb28e691b39aa2b43b39d6bd167b057ba1ce50bf 100644 (file)
--- 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": [