From: Thanh Ha (zxiiro) Date: Wed, 16 Sep 2020 15:43:02 +0000 (+0000) Subject: Merge "Install Docker in regular builder" X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=f59aa9c82938ce4e901686d00c1990406b41ee93;hp=c5c955aa61278e1ea56f08d5fb626528373bb53b;p=releng%2Fbuilder.git Merge "Install Docker in regular builder" --- diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml index cb56f89c4..ff9d444c3 100644 --- a/packer/provision/local-builder.yaml +++ b/packer/provision/local-builder.yaml @@ -1,5 +1,6 @@ --- - import_playbook: ../common-packer/provision/baseline.yaml +- import_playbook: ../common-packer/provision/docker.yaml - hosts: all become_user: root diff --git a/packer/templates/builder.json b/packer/templates/builder.json deleted file mode 120000 index bd227be50..000000000 --- a/packer/templates/builder.json +++ /dev/null @@ -1 +0,0 @@ -../common-packer/templates/builder.json \ No newline at end of file diff --git a/packer/templates/builder.json b/packer/templates/builder.json new file mode 100644 index 000000000..fa19226a8 --- /dev/null +++ b/packer/templates/builder.json @@ -0,0 +1,62 @@ +{ + "variables": { + "ansible_roles_path": ".galaxy", + "arch": "x86_64", + "base_image": null, + "cloud_network": null, + "cloud_user_data": null, + "cloud_region": "ca-ymq-1", + "cloud_availability_zone": "ca-ymq-2", + "vm_use_block_storage": "true", + "vm_volume_size": "20", + "vm_image_disk_format": "", + "distro": null, + "flavor": "v2-highcpu-4", + "ssh_user": null, + "ssh_proxy_host": "" + }, + "builders": [ + { + "name": "vexxhost", + "image_name": "ZZCI - {{user `distro`}} - builder - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", + "instance_name": "{{user `distro`}}-builder-{{uuid}}", + "source_image_name": "{{user `base_image`}}", + "type": "openstack", + "region": "{{user `cloud_region`}}", + "availability_zone": "{{user `cloud_availability_zone`}}", + "networks": ["{{user `cloud_network`}}"], + "user_data_file": "{{user `cloud_user_data`}}", + "ssh_username": "{{user `ssh_user`}}", + "ssh_proxy_host": "{{user `ssh_proxy_host`}}", + "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`}}" + } + ], + "provisioners": [ + { + "type": "shell", + "scripts": ["common-packer/provision/install-python.sh"], + "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi" + }, + { + "type": "shell-local", + "command": "./common-packer/ansible-galaxy.sh {{user `ansible_roles_path`}}" + }, + { + "type": "ansible", + "playbook_file": "provision/local-builder.yaml", + "ansible_env_vars": [ + "ANSIBLE_NOCOWS=1", + "ANSIBLE_PIPELINING=True", + "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}", + "ANSIBLE_CALLBACK_WHITELIST=profile_tasks", + "ANSIBLE_STDOUT_CALLBACK=debug" + ] + } + ] +}