diff options
Diffstat (limited to 'packer')
| m--------- | packer/common-packer | 0 | ||||
| -rw-r--r-- | packer/provision/basebuild.sh | 25 | ||||
| -rw-r--r-- | packer/provision/local-builder.yaml | 58 | ||||
| l--------- | packer/templates/builder.pkr.hcl | 1 | ||||
| l--------- | packer/templates/docker.pkr.hcl | 1 | ||||
| -rw-r--r-- | packer/vars/ubuntu-16.04-arm64.json | 12 | ||||
| -rw-r--r-- | packer/vars/ubuntu-18.04-arm64.json | 12 |
7 files changed, 74 insertions, 35 deletions
diff --git a/packer/common-packer b/packer/common-packer -Subproject 6d13061d653ffe84de00a904c6b49f4caaee2e3 +Subproject 09cb3bcf48185afdc5af0a548be904491ae215d diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh index 75b9148e1..62f3af55d 100644 --- a/packer/provision/basebuild.sh +++ b/packer/provision/basebuild.sh @@ -111,9 +111,9 @@ ubuntu_systems() { # DEB Install Python dependencies echo "---> Installing Python dependencies $(date +'%Y%m%dT%H%M%S')" - PYTHON_PKGS="python-all python-dev python-virtualenv python-setuptools \ - python-pip libssl-dev libmysqlclient-dev python2.7 libffi-dev \ - python-cffi" + PYTHON_PKGS="python-all python-dev python3-virtualenv python-setuptools \ + python3-pip libssl-dev libmysqlclient-dev python2.7 \ + libffi-dev python-cffi" apt install -y ${PYTHON_PKGS} # Memory leakage checks @@ -158,11 +158,10 @@ ubuntu_systems() { # DEB Install deb_dpdk packages to shorten build times ###REMOVED sphinx-rtd-theme echo "---> Installing deb_dpdk packages $(date +'%Y%m%dT%H%M%S')" - DEB_DPDK_PKGS="google-mock lsb-release dpkg-dev debian-xcontrol devscripts \ - pristine-tar dh-python python-sphinx libpcap0.8-dev libstdc++5 \ - python-scapy inkscape libxen-dev libxenstore3.0 python-sphinx-rtd-theme \ - python3 python3-sphinx python3-sphinx-rtd-theme libnuma-dev \ - libibverbs-dev" + DEB_DPDK_PKGS="google-mock lsb-release dpkg-dev devscripts pristine-tar \ + dh-python sphinx-doc sphinx-common libpcap0.8-dev libstdc++5 \ + python3-scapy inkscape libxen-dev libxenstore3.0 python3 \ + python3-sphinx python3-sphinx-rtd-theme libibverbs-dev libnuma-dev" apt install -y ${DEB_DPDK_PKGS} sudo apt install -y libcap-dev libpcap-dev @@ -182,6 +181,16 @@ ubuntu_systems() { echo "---> Forcing CA certificate update $(date +'%Y%m%dT%H%M%S')" sudo update-ca-certificates -f > /dev/null 2>&1 echo "<--- Forcing CA certificate update $(date +'%Y%m%dT%H%M%S')" + + # Install TLDK development tools + echo "---> Installing TLDK packages $(date +'%Y%m%dT%H%M%S')" + TLDK_PKGS="libaprutil1-dev libc-dev-bin libc6-dev libcrypt-dev \ + libexpat1-dev libldap2-dev libsctp-dev libsctp1 libserf-1-1 libsvn1 \ + linux-libc-dev python3-pyelftools libnuma-dev" + apt install -y ${TLDK_PKGS} + + pip3 install meson ninja + } opensuse_systems() { diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml index a42049c77..ef904075e 100644 --- a/packer/provision/local-builder.yaml +++ b/packer/provision/local-builder.yaml @@ -14,13 +14,65 @@ name: vm.nr_hugepages value: '128' reload: no - # yamllint disable-line rule:line-length - when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '16.04' + when: ansible_distribution == 'Ubuntu' become: true - name: 'Install PackageCloud' command: 'gem install package_cloud' - # yamllint disable-line rule:line-length + when: ansible_distribution == 'Ubuntu' + become: true + + - apt_repository: + repo: ppa:deadsnakes/ppa + state: present + become: true + when: ansible_distribution == 'Ubuntu' + + - name: Update and upgrade apt packages + apt: + upgrade: 'yes' + update_cache: yes + become: true + when: ansible_distribution == 'Ubuntu' + + - name: Install python-tox and deps + pip: + name: + - tox + - tox-pyenv + - python-virtualenv + state: present + become: true + when: ansible_distribution == 'Ubuntu' + + - name: 'Apt Install TLDK Packages' + apt: + name: + - libaprutil1-dev + - libc-dev-bin + - libc6-dev + - libcap-dev + - libcrypt-dev + - libexpat1-dev + - libldap2-dev + - libsctp-dev + - libsctp1 + - libserf-1-1 + - libsvn1 + - linux-libc-dev + - python3-pyelftools + - python3-scapy + - libnuma-dev + state: present + when: ansible_distribution == 'Ubuntu' + become: true + + - name: Pip Install TLDK Packages + pip: + name: + - meson==0.59.0 + - ninja + state: present when: ansible_distribution == 'Ubuntu' become: true diff --git a/packer/templates/builder.pkr.hcl b/packer/templates/builder.pkr.hcl new file mode 120000 index 000000000..8ea2d8721 --- /dev/null +++ b/packer/templates/builder.pkr.hcl @@ -0,0 +1 @@ +../common-packer/templates/builder.pkr.hcl
\ No newline at end of file diff --git a/packer/templates/docker.pkr.hcl b/packer/templates/docker.pkr.hcl new file mode 120000 index 000000000..08567dfdd --- /dev/null +++ b/packer/templates/docker.pkr.hcl @@ -0,0 +1 @@ +../common-packer/templates/docker.pkr.hcl
\ No newline at end of file diff --git a/packer/vars/ubuntu-16.04-arm64.json b/packer/vars/ubuntu-16.04-arm64.json deleted file mode 100644 index ad161dc4f..000000000 --- a/packer/vars/ubuntu-16.04-arm64.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "arch": "arm64", - "base_image": "Ubuntu 16.04 LTS (arm64) [2020-03-11]", - "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh", - "distro": "Ubuntu 16.04", - "flavor": "v2-standard-1", - "source_ami_filter_name": "*ubuntu*16.04*", - "source_ami_filter_owner": "099720109477", - "ssh_user": "ubuntu", - "vm_use_block_storage": "true", - "vm_image_disk_format": "raw" -} diff --git a/packer/vars/ubuntu-18.04-arm64.json b/packer/vars/ubuntu-18.04-arm64.json deleted file mode 100644 index 38315f86b..000000000 --- a/packer/vars/ubuntu-18.04-arm64.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "arch": "arm64", - "base_image": "Ubuntu 18.04 LTS (arm64) [2020-02-18]", - "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh", - "distro": "Ubuntu 18.04", - "flavor": "v2-standard-1", - "source_ami_filter_name": "*ubuntu*18.04*", - "source_ami_filter_owner": "099720109477", - "ssh_user": "ubuntu", - "vm_use_block_storage": "true", - "vm_image_disk_format": "raw" -} |