From a2623fc0e16cf8fe6334ddda156e6701e2063703 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Tue, 24 Aug 2021 16:55:24 +0100 Subject: [PATCH 1/6] ansible: add first equinix Altra as docker host Signed-off-by: Stewart X Addison --- ansible/inventory.yml | 222 +++++++----------- ansible/plugins/inventory/nodejs_yaml.py | 4 +- .../docker/templates/ubuntu2004.Dockerfile.j2 | 43 ++++ .../ubuntu2004_sharedlibs.Dockerfile.j2 | 108 +++++++++ 4 files changed, 238 insertions(+), 139 deletions(-) create mode 100644 ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2 create mode 100644 ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 diff --git a/ansible/inventory.yml b/ansible/inventory.yml index c30071e31..d5d1e38b4 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -14,22 +14,18 @@ hosts: ubuntu1604-x64-1: {ip: 138.197.224.240, alias: www} ubuntu1804-x64-1: {ip: 178.128.202.158, alias: gzemnid} ubuntu1804-x64-2: {ip: 45.55.45.227, alias: unofficial-builds} - ubuntu1804-x64-3: {ip: 157.245.7.159, alias: metrics} - - - ibm: - ubuntu1804-x64-1: {ip: 169.45.166.50, alias: ci-release} - ubuntu2004-x64-1: {ip: 169.60.150.91, alias: ansible} - joyent: - debian10-x64-1: {ip: 147.75.88.62, alias: grafana} - smartos15-x64-1: {ip: 139.178.83.227, alias: backup} - ubuntu1604-x64-1: {ip: 147.75.88.57, alias: unencrypted} + smartos15-x64-1: {ip: 165.225.151.21, alias: backup} + ubuntu1604-x64-1: {ip: 165.225.149.55, alias: unencrypted} - rackspace: debian8-x64-1: {ip: 23.253.100.79, alias: gh-bot} - softlayer: debian8-x64-1: {ip: 184.172.29.199, alias: registry-mirror} + ubuntu1404-x64-1: {ip: 169.44.16.104, alias: ci-release} + ubuntu1404-x64-2: {ip: 50.23.85.254} - release: @@ -39,55 +35,33 @@ hosts: centos7-x64-1: {ip: 138.68.12.105} - ibm: - aix71-ppc64_be-2: - ip: 169.48.19.173 - server_jobs: 6 + aix71-ppc64_be-1: {ip: 129.33.196.199, user: b9s010a} rhel7-s390x-1: {ip: 148.100.86.101, user: linux1} - iinthecloud: ibmi73-ppc64_be-1: {ip: 65.183.160.62, user: nodejs} - joyent: - smartos17-x64-2: {ip: 147.75.88.60} - smartos18-x64-2: {ip: 147.75.88.53} - ubuntu1804_docker-x64-1: {ip: 147.75.88.56, user: ubuntu} + smartos15-x64-2: {ip: 165.225.148.139} + smartos17-x64-2: {ip: 165.225.149.208} + smartos18-x64-2: {ip: 165.225.148.12} + ubuntu1804_docker-x64-1: {ip: 165.225.150.76, user: ubuntu} - macstadium: - macos11.0-arm64-1: - ansible_python_interpreter: /usr/bin/python3 - ip: 207.254.38.74 - user: administrator - remote_env: - PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin - server_jobs: 6 + macos10.11-x64-1: {ip: 207.254.58.162, port: 10013, user: administrator} + macos10.10-x64-1: {ip: 207.254.58.162, port: 10014, user: administrator} - marist: - zos24-s390x-1: {ip: 148.100.36.157, user: unix1} + zos13-s390x-1: {ip: 148.100.36.135, user: Unix1} - nearform: - macos10.15-x64-1: - ip: 83.147.191.69 - user: administrator - ansible_python_interpreter: /usr/bin/python3 - macos11.0-arm64-1: - ansible_python_interpreter: /usr/bin/python3 - ip: 83.147.191.76 - user: admin - remote_env: - PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin + macos10.15-x64-1: {ip: 83.147.191.69, user: administrator} - osuosl: centos7-ppc64_le-1: {ip: 140.211.168.61, user: centos} - aix72-ppc64_be-1: - ip: 140.211.9.77 - server_jobs: 6 - orka: - macos10.15-x64-1: - ansible_python_interpreter: /usr/bin/python3 - ip: 199.7.167.101 - port: 8822 - user: administrator + macos10.15-x64-1: {ip: 199.7.167.101, port: 8822, user: administrator} - packetnet: centos7-arm64-1: {ip: 147.75.104.218} @@ -95,6 +69,11 @@ hosts: - requireio: rvagg-debian10-armv6l_pi1p-1: {ip: 192.168.2.40, user: pi, alias: iojs-ns-pi1p-1 } andineck-debian10-armv6l_pi1p-1: {ip: 192.168.2.41, user: pi, alias: iojs-ns-pi1p-2 } + osx1010-x64-1: {ip: 192.168.2.211, user: iojs} + + - scaleway: + ubuntu1604-armv7l-1: {ip: 212.47.245.242} + ubuntu1604-armv7l-2: {ip: 212.47.234.107} - softlayer: centos6-x64-1: {ip: 50.97.245.10} @@ -125,7 +104,7 @@ hosts: - digitalocean: debian8-x64-1: {ip: 159.203.103.52} debian9-x64-1: {ip: 138.197.97.208} - fedora32-x64-1: {ip: 159.203.117.50} + fedora27-x64-1: {ip: 159.203.117.50} fedora30-x64-1: {ip: 178.62.236.249} fedora30-x64-2: {ip: 159.203.98.84} freebsd11-x64-1: {ip: 45.55.90.237, user: freebsd} @@ -138,89 +117,67 @@ hosts: ubuntu1804_docker-x64-2: {ip: 159.89.183.200} ubuntu1804-x64-1: {ip: 178.128.181.213} + - equinix: + ubuntu2004_docker-arm64-1: {ip: 145.40.81.219} + - ibm: - aix71-ppc64_be-3: - ip: 169.48.22.38 - server_jobs: 6 - aix71-ppc64_be-4: - ip: 169.48.22.51 - server_jobs: 6 - rhel7-s390x-1: {ip: 148.100.86.21, user: linux1, build_test_v8: yes} - rhel7-s390x-2: {ip: 148.100.86.117, user: linux1, build_test_v8: yes} - rhel7-s390x-3: {ip: 148.100.86.28, user: linux1, build_test_v8: yes} - rhel7-s390x-4: {ip: 148.100.86.94, user: linux1, build_test_v8: yes} + aix71-ppc64_be-1: {ip: 129.33.196.197, user: b9s010a} + aix71-ppc64_be-2: {ip: 129.33.196.198, user: b9s010a} + rhel7-s390x-1: {ip: 148.100.86.21, user: linux1} + rhel7-s390x-2: {ip: 148.100.86.117, user: linux1} + rhel7-s390x-3: {ip: 148.100.86.28, user: linux1} + rhel7-s390x-4: {ip: 148.100.86.94, user: linux1} ubuntu1804-x64-1: {ip: 52.117.26.14, alias: jenkins-workspace-6} - joyent: - smartos17-x64-3: {ip: 147.75.88.59} - smartos17-x64-4: {ip: 147.75.88.61} - smartos18-x64-3: {ip: 147.75.88.54} - smartos18-x64-4: {ip: 147.75.88.55} - ubuntu1804-x64-1: {ip: 147.75.88.51, user: ubuntu} - - - macstadium: - macos11.0-arm64-3: - ansible_python_interpreter: /usr/bin/python3 - ip: 207.254.38.86 - user: administrator - remote_env: - PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin - macos11.0-arm64-4: - ansible_python_interpreter: /usr/bin/python3 - ip: 207.254.38.89 - user: administrator - remote_env: - PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin + smartos15-x64-3: {ip: 165.225.148.128} + smartos15-x64-4: {ip: 165.225.149.91} + smartos16-x64-3: {ip: 165.225.151.106} + smartos16-x64-4: {ip: 165.225.149.158} + smartos17-x64-3: {ip: 165.225.148.15} + smartos17-x64-4: {ip: 165.225.148.16} + smartos18-x64-3: {ip: 165.225.151.114} + smartos18-x64-4: {ip: 165.225.149.13} + ubuntu1804_docker-x64-1: {ip: 165.225.151.201, user: ubuntu} + ubuntu1804-x64-1: {ip: 165.225.149.88, user: ubuntu} - marist: - zos24-s390x-1: - ip: 148.100.36.155 - user: unix1 - ansible_python_interpreter: /rsusr/rocket/python-2017-04-12-py27/python27/bin/python - become_method: su - cmake_path_env: "{{ home }}/{{ server_user }}:/rsusr/rocket/bin:/bin" - git_cmd: /rsusr/rocket/bin/git + zos13-s390x-1: + ip: 148.100.36.133 + user: Unix1 remote_env: - LIBPATH: /lib:/usr/lib:.:/rsusr/rocket/lib/perl5/5.24.0/os390/CORE.pod:/rsusr/rocket/python-2017-04-12-py27/python27/lib/ - PATH: /rsusr/rocket/python-2017-04-12-py27/python27/bin:/bin:/rsusr/rocket/bin - SSL_CERT_FILE: "{{ home }}/{{ server_user }}/ca-bundle.crt" + LIBPATH: /lib:/usr/lib:.:/NODEJS2/lib/perl5/5.24.0/os390/CORE.pod:/NODEJS2/python-2017-04-12-py27/python27/lib/ + PATH: /NODEJS2/python-2017-04-12-py27/python27/bin:/bin:/NODEJS2/bin:/NODEJS/bin server_jobs: 4 - zos24-s390x-2: - ip: 148.100.36.156 - user: unix1 - ansible_python_interpreter: /rsusr/rocket/python-2017-04-12-py27/python27/bin/python - become_method: su - cmake_path_env: "{{ home }}/{{ server_user }}:/rsusr/rocket/bin:/bin" - git_cmd: /rsusr/rocket/bin/git + zos13-s390x-2: + ip: 148.100.36.134 + user: Unix1 remote_env: - LIBPATH: /lib:/usr/lib:.:/rsusr/rocket/lib/perl5/5.24.0/os390/CORE.pod:/rsusr/rocket/python-2017-04-12-py27/python27/lib/ - PATH: /rsusr/rocket/python-2017-04-12-py27/python27/bin:/bin:/rsusr/rocket/bin - SSL_CERT_FILE: "{{ home }}/{{ server_user }}/ca-bundle.crt" + LIBPATH: /lib:/usr/lib:.:/NODEJS2/lib/perl5/5.24.0/os390/CORE.pod:/NODEJS2/python-2017-04-12-py27/python27/lib/ + PATH: /NODEJS2/python-2017-04-12-py27/python27/bin:/bin:/NODEJS2/bin:/NODEJS/bin server_jobs: 4 + - mininodes: + ubuntu1604-arm64_odroid_c2-1: {ip: 70.167.220.147} + ubuntu1604-arm64_odroid_c2-2: {ip: 70.167.220.148} + ubuntu1604-arm64_odroid_c2-3: {ip: 70.167.220.149, user: odroid} + + - macstadium: + macos10.10-x64-1: {ip: 207.254.58.162, port: 10005, user: administrator} + macos10.10-x64-2: {ip: 207.254.58.162, port: 10006, user: administrator} + macos10.11-x64-1: {ip: 207.254.58.162, port: 10003, user: administrator} + macos10.11-x64-2: {ip: 207.254.58.162, port: 10004, user: administrator} + macos10.12-x64-1: {ip: 207.254.58.162, port: 10001, user: administrator} + macos10.12-x64-2: {ip: 207.254.58.162, port: 10002, user: administrator} + - msft: win10_vs2017-arm64-1: {} win10_vs2017-arm64-2: {} - nearform: - macos10.15-x64-1: - ip: 83.147.191.70 - user: administrator - ansible_python_interpreter: /usr/bin/python3 - macos10.15-x64-2: - ip: 83.147.191.71 - user: administrator - ansible_python_interpreter: /usr/bin/python3 - macos10.15-x64-3: - ip: 83.147.191.72 - user: administrator - ansible_python_interpreter: /usr/bin/python3 - macos11.0-arm64-1: - ansible_python_interpreter: /usr/bin/python3 - ip: 83.147.191.75 - user: admin - remote_env: - PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin + macos10.15-x64-1: {ip: 83.147.191.70, user: administrator} + macos10.15-x64-2: {ip: 83.147.191.71, user: administrator} + macos10.15-x64-3: {ip: 83.147.191.72, user: administrator} intel-ubuntu1604-x64-1: {ip: 92.51.196.114} intel-ubuntu1604-x64-2: {ip: 92.51.196.115} @@ -242,31 +199,11 @@ hosts: centos7-ppc64_le-4: {ip: 140.211.168.194, user: centos, build_test_v8: yes} - orka: - macos10.15-x64-1: - ansible_python_interpreter: /usr/bin/python3 - ip: 199.7.167.100 - port: 8823 - user: administrator - macos10.15-x64-2: - ansible_python_interpreter: /usr/bin/python3 - ip: 199.7.167.99 - port: 8823 - user: administrator - macos10.14-x64-1: - ansible_python_interpreter: /usr/local/bin/python3 - ip: 199.7.167.99 - port: 8822 - user: administrator - macos10.14-x64-2: - ansible_python_interpreter: /usr/local/bin/python3 - ip: 199.7.167.100 - port: 8824 - user: administrator - macos10.14-x64-3: - ansible_python_interpreter: /usr/local/bin/python3 - ip: 199.7.167.101 - port: 8824 - user: administrator + macos10.15-x64-1: {ip: 199.7.167.100, port: 8823, user: administrator} + macos10.15-x64-2: {ip: 199.7.167.99, port: 8823, user: administrator} + macos10.14-x64-1: {ip: 199.7.167.99, port: 8822, user: administrator} + macos10.14-x64-2: {ip: 199.7.167.100, port: 8824, user: administrator} + macos10.14-x64-3: {ip: 199.7.167.101, port: 8824, user: administrator} - iinthecloud: ibmi73-ppc64_be-1: {ip: 65.183.160.52, user: nodejs} @@ -281,8 +218,8 @@ hosts: - rackspace: centos7-x64-1: {ip: 119.9.27.82} debian8-x64-1: {ip: 23.253.109.216} - debian10-x64-1: {ip: 104.239.140.184} - fedora32-x64-1: {ip: 119.9.51.79} + debian8-x64-2: {ip: 104.239.140.184} + fedora27-x64-1: {ip: 119.9.51.79} ubuntu1604-x64-1: {ip: 119.9.51.176} ubuntu1604-x64-2: {ip: 104.130.124.194} win2012r2_vs2013-x64-1: {ip: 104.239.174.165} @@ -339,12 +276,23 @@ hosts: piccoloaiutante-debian10-arm64_pi3-1: {ip: 192.168.2.89, user: pi, alias: iojs-ns-pi3-10 } kahwee-debian10-arm64_pi3-1: {ip: 192.168.2.90, user: pi, alias: iojs-ns-pi3-11 } + rvagg-ubuntu1404-arm64_odroidxu3-1: {ip: 192.168.2.10, user: odroid} + rvagg-ubuntu1404-arm64_odroidxu-1: {ip: 192.168.2.15} + rvagg-ubuntu1404-arm64_odroidxu-2: {ip: 192.168.2.16} + + osx1010-x64-1: {ip: 192.168.2.210, user: iojs} + + - scaleway: + ubuntu1804-armv7l-1: {ip: 212.47.233.202} + ubuntu1804-armv7l-2: {ip: 212.47.246.3} + ubuntu1804-armv7l-3: {ip: 212.47.227.202} + - softlayer: centos6-x64-1: {ip: 169.61.75.51} centos6-x64-2: {ip: 169.61.75.58} centos7-x64-1: {ip: 50.23.85.250} - debian9-x64-1: {ip: 169.60.150.88} - debian10-x64-1: {ip: 169.44.16.126} + debian8-x86-1: {ip: 169.44.16.126} + debian9-x64-1: {ip: 169.60.150.91} ubuntu1404-x64-1: {ip: 50.97.245.5} ubuntu1404-x86-1: {ip: 50.97.245.9} ubuntu1804_docker-x64-1: {ip: 52.117.26.9} diff --git a/ansible/plugins/inventory/nodejs_yaml.py b/ansible/plugins/inventory/nodejs_yaml.py index 162dae499..949083d6a 100755 --- a/ansible/plugins/inventory/nodejs_yaml.py +++ b/ansible/plugins/inventory/nodejs_yaml.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env /usr/local/bin/python3 # -*- coding: utf-8 -*- # Copyright Node.js contributors. All rights reserved. @@ -46,7 +46,7 @@ 'type': ('infra', 'release', 'test'), # providers - validated for consistency - 'provider': ('azure', 'digitalocean', 'ibm', 'iinthecloud', 'joyent', + 'provider': ('azure', 'digitalocean', 'equinix', 'ibm', 'iinthecloud', 'joyent', 'linuxonecc', 'macstadium', 'marist', 'mininodes', 'msft', 'nearform', 'orka', 'osuosl', 'packetnet', 'rackspace', 'requireio', 'rzkh', 'scaleway', 'softlayer', 'voxer') diff --git a/ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2 new file mode 100644 index 000000000..fa0aef602 --- /dev/null +++ b/ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2 @@ -0,0 +1,43 @@ +FROM ubuntu:18.04 + +ENV LC_ALL C +ENV USER {{ server_user }} +ENV JOBS {{ server_jobs | default(ansible_processor_vcpus) }} +ENV SHELL /bin/bash +ENV HOME /home/{{ server_user }} +ENV PATH /usr/lib/ccache/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe +ENV NODE_TEST_DIR /home/{{ server_user }}/tmp +ENV OSTYPE linux-gnu +ENV OSVARIANT docker +ENV DESTCPU x64 +ENV ARCH x64 + +RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \ + ccache \ + g++-8 \ + gcc-8 \ + git \ + openjdk-8-jre-headless \ + curl \ + python3-pip \ + libfontconfig1 + +RUN pip3 install tap2junit + +RUN addgroup --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }} + +RUN adduser --gid {{ server_user_gid.stdout_lines[0] }} --uid {{ server_user_uid.stdout_lines[0] }} --disabled-password --gecos {{ server_user }} {{ server_user }} + +VOLUME /home/{{ server_user }}/ /home/{{ server_user }}/.ccache + +USER iojs:iojs + +ENV CCACHE_TEMPDIR /home/iojs/.ccache/{{ item.name }} + +CMD cd /home/iojs \ + && curl https://ci.nodejs.org/jnlpJars/slave.jar -O \ + && java -Xmx{{ server_ram|default('128m') }} \ + -jar /home/{{ server_user }}/slave.jar \ + -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/slave-agent.jnlp \ + -secret {{ item.secret }} diff --git a/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 new file mode 100644 index 000000000..658f2c83b --- /dev/null +++ b/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 @@ -0,0 +1,108 @@ +FROM ubuntu:18.04 + +ENV LC_ALL C +ENV USER {{ server_user }} +ENV JOBS {{ server_jobs | default(ansible_processor_vcpus) }} +ENV SHELL /bin/bash +ENV HOME /home/{{ server_user }} +ENV PATH /usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe +ENV NODE_TEST_DIR /home/{{ server_user }}/tmp +ENV OSTYPE linux-gnu +ENV OSVARIANT docker +ENV DESTCPU x64 +ENV ARCH x64 +ENV DEBIAN_FRONTEND noninteractive + +RUN apt-get update && apt-get install apt-utils -y && \ + apt-get dist-upgrade -y && apt-get install -y \ + ccache \ + g++-8 \ + gcc-8 \ + git \ + openjdk-8-jre-headless \ + pkg-config \ + curl \ + python3-pip \ + libfontconfig1 + +RUN pip3 install tap2junit + +RUN addgroup --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }} + +RUN adduser --gid {{ server_user_gid.stdout_lines[0] }} --uid {{ server_user_uid.stdout_lines[0] }} --disabled-password --gecos {{ server_user }} {{ server_user }} + +ENV ICU64DIR=/opt/icu-64.1 \ + ICU65DIR=/opt/icu-65.1 \ + ICU67DIR=/opt/icu-67.1 \ + ICU68DIR=/opt/icu-68.2 \ + ICU69DIR=/opt/icu-69.1 + +RUN for ICU_ENV in $(env | grep ICU..DIR); do \ + ICU_PREFIX=$(echo $ICU_ENV | cut -d '=' -f 2) && \ + ICU_VERSION=$(echo $ICU_PREFIX | cut -d '-' -f 2) && \ + ICU_MAJOR=$(echo $ICU_VERSION | cut -d '.' -f 1) && \ + ICU_MINOR=$(echo $ICU_VERSION | cut -d '.' -f 2) && \ + mkdir -p /tmp/icu-$ICU_VERSION && \ + cd /tmp/icu-$ICU_VERSION && \ + curl -sL "https://github.com/unicode-org/icu/releases/download/release-$ICU_MAJOR-$ICU_MINOR/icu4c-${ICU_MAJOR}_$ICU_MINOR-src.tgz" | tar zxv --strip=1 && \ + cd source && \ + ./runConfigureICU Linux --prefix=$ICU_PREFIX && \ + make -j $JOBS && \ + make install && \ + rm -rf /tmp/icu-$ICU_VERSION; \ + done + +ENV OPENSSL110DIR /opt/openssl-1.1.0l + +RUN mkdir -p /tmp/openssl_1.1.0l && \ + cd /tmp/openssl_1.1.0l && \ + curl -sL https://www.openssl.org/source/openssl-1.1.0l.tar.gz | tar zxv --strip=1 && \ + ./config --prefix=$OPENSSL110DIR && \ + make -j 6 && \ + make install && \ + rm -rf /tmp/openssl_1.1.0l + +ENV OPENSSL111DIR /opt/openssl-1.1.1k + +RUN mkdir -p /tmp/openssl_1.1.1k && \ + cd /tmp/openssl_1.1.1k && \ + curl -sL https://www.openssl.org/source/openssl-1.1.1k.tar.gz | tar zxv --strip=1 && \ + ./config --prefix=$OPENSSL111DIR && \ + make -j 6 && \ + make install && \ + rm -rf /tmp/openssl_1.1.1k + +ENV OPENSSL300DIR /opt/openssl-3.0.0 + +RUN mkdir -p /tmp/openssl_3.0.0 && \ + cd /tmp/openssl_3.0.0 && \ + git clone https://github.com/quictls/openssl.git -b openssl-3.0.0-alpha16+quic --depth 1 && \ + cd openssl && \ + ./config --prefix=$OPENSSL300DIR && \ + make -j 6 && \ + make install && \ + rm -rf /tmp/openssl_3.0.0 + +ENV ZLIB12DIR /opt/zlib_1.2.11 + +RUN mkdir -p /tmp/zlib_1.2.11 && \ + cd /tmp/zlib_1.2.11 && \ + curl -sL https://zlib.net/zlib-1.2.11.tar.gz | tar zxv --strip=1 && \ + ./configure --prefix=$ZLIB12DIR && \ + make -j 6 && \ + make install && \ + rm -rf /tmp/zlib_1.2.11 + +VOLUME /home/{{ server_user }}/ /home/{{ server_user }}/.ccache + +USER iojs:iojs + +ENV CCACHE_TEMPDIR /home/iojs/.ccache/{{ item.name }} + +CMD cd /home/iojs \ + && curl https://ci.nodejs.org/jnlpJars/slave.jar -O \ + && java -Xmx{{ server_ram|default('128m') }} \ + -jar /home/{{ server_user }}/slave.jar \ + -jnlpUrl {{ jenkins_url }}/computer/{{ item.name }}/slave-agent.jnlp \ + -secret {{ item.secret }} From 267994d5dd3ca914d4d9552acfd43d5b53217115 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Tue, 24 Aug 2021 17:57:31 +0100 Subject: [PATCH 2/6] build,test: prevent Node12 builds running on ubuntu 20 (no python2) Signed-off-by: Stewart X Addison --- ansible/inventory.yml | 219 ++++++++++++------- jenkins/scripts/VersionSelectorScript.groovy | 1 + 2 files changed, 138 insertions(+), 82 deletions(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index d5d1e38b4..6dbfac3c7 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -14,18 +14,22 @@ hosts: ubuntu1604-x64-1: {ip: 138.197.224.240, alias: www} ubuntu1804-x64-1: {ip: 178.128.202.158, alias: gzemnid} ubuntu1804-x64-2: {ip: 45.55.45.227, alias: unofficial-builds} + ubuntu1804-x64-3: {ip: 157.245.7.159, alias: metrics} + + - ibm: + ubuntu1804-x64-1: {ip: 169.45.166.50, alias: ci-release} + ubuntu2004-x64-1: {ip: 169.60.150.91, alias: ansible} - joyent: - smartos15-x64-1: {ip: 165.225.151.21, alias: backup} - ubuntu1604-x64-1: {ip: 165.225.149.55, alias: unencrypted} + debian10-x64-1: {ip: 147.75.88.62, alias: grafana} + smartos15-x64-1: {ip: 139.178.83.227, alias: backup} + ubuntu1604-x64-1: {ip: 147.75.88.57, alias: unencrypted} - rackspace: debian8-x64-1: {ip: 23.253.100.79, alias: gh-bot} - softlayer: debian8-x64-1: {ip: 184.172.29.199, alias: registry-mirror} - ubuntu1404-x64-1: {ip: 169.44.16.104, alias: ci-release} - ubuntu1404-x64-2: {ip: 50.23.85.254} - release: @@ -35,33 +39,55 @@ hosts: centos7-x64-1: {ip: 138.68.12.105} - ibm: - aix71-ppc64_be-1: {ip: 129.33.196.199, user: b9s010a} + aix71-ppc64_be-2: + ip: 169.48.19.173 + server_jobs: 6 rhel7-s390x-1: {ip: 148.100.86.101, user: linux1} - iinthecloud: ibmi73-ppc64_be-1: {ip: 65.183.160.62, user: nodejs} - joyent: - smartos15-x64-2: {ip: 165.225.148.139} - smartos17-x64-2: {ip: 165.225.149.208} - smartos18-x64-2: {ip: 165.225.148.12} - ubuntu1804_docker-x64-1: {ip: 165.225.150.76, user: ubuntu} + smartos17-x64-2: {ip: 147.75.88.60} + smartos18-x64-2: {ip: 147.75.88.53} + ubuntu1804_docker-x64-1: {ip: 147.75.88.56, user: ubuntu} - macstadium: - macos10.11-x64-1: {ip: 207.254.58.162, port: 10013, user: administrator} - macos10.10-x64-1: {ip: 207.254.58.162, port: 10014, user: administrator} + macos11.0-arm64-1: + ansible_python_interpreter: /usr/bin/python3 + ip: 207.254.38.74 + user: administrator + remote_env: + PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin + server_jobs: 6 - marist: - zos13-s390x-1: {ip: 148.100.36.135, user: Unix1} + zos24-s390x-1: {ip: 148.100.36.157, user: unix1} - nearform: - macos10.15-x64-1: {ip: 83.147.191.69, user: administrator} + macos10.15-x64-1: + ip: 83.147.191.69 + user: administrator + ansible_python_interpreter: /usr/bin/python3 + macos11.0-arm64-1: + ansible_python_interpreter: /usr/bin/python3 + ip: 83.147.191.76 + user: admin + remote_env: + PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin - osuosl: centos7-ppc64_le-1: {ip: 140.211.168.61, user: centos} + aix72-ppc64_be-1: + ip: 140.211.9.77 + server_jobs: 6 - orka: - macos10.15-x64-1: {ip: 199.7.167.101, port: 8822, user: administrator} + macos10.15-x64-1: + ansible_python_interpreter: /usr/bin/python3 + ip: 199.7.167.101 + port: 8822 + user: administrator - packetnet: centos7-arm64-1: {ip: 147.75.104.218} @@ -69,11 +95,6 @@ hosts: - requireio: rvagg-debian10-armv6l_pi1p-1: {ip: 192.168.2.40, user: pi, alias: iojs-ns-pi1p-1 } andineck-debian10-armv6l_pi1p-1: {ip: 192.168.2.41, user: pi, alias: iojs-ns-pi1p-2 } - osx1010-x64-1: {ip: 192.168.2.211, user: iojs} - - - scaleway: - ubuntu1604-armv7l-1: {ip: 212.47.245.242} - ubuntu1604-armv7l-2: {ip: 212.47.234.107} - softlayer: centos6-x64-1: {ip: 50.97.245.10} @@ -104,7 +125,7 @@ hosts: - digitalocean: debian8-x64-1: {ip: 159.203.103.52} debian9-x64-1: {ip: 138.197.97.208} - fedora27-x64-1: {ip: 159.203.117.50} + fedora32-x64-1: {ip: 159.203.117.50} fedora30-x64-1: {ip: 178.62.236.249} fedora30-x64-2: {ip: 159.203.98.84} freebsd11-x64-1: {ip: 45.55.90.237, user: freebsd} @@ -121,63 +142,88 @@ hosts: ubuntu2004_docker-arm64-1: {ip: 145.40.81.219} - ibm: - aix71-ppc64_be-1: {ip: 129.33.196.197, user: b9s010a} - aix71-ppc64_be-2: {ip: 129.33.196.198, user: b9s010a} - rhel7-s390x-1: {ip: 148.100.86.21, user: linux1} - rhel7-s390x-2: {ip: 148.100.86.117, user: linux1} - rhel7-s390x-3: {ip: 148.100.86.28, user: linux1} - rhel7-s390x-4: {ip: 148.100.86.94, user: linux1} + aix71-ppc64_be-3: + ip: 169.48.22.38 + server_jobs: 6 + aix71-ppc64_be-4: + ip: 169.48.22.51 + server_jobs: 6 + rhel7-s390x-1: {ip: 148.100.86.21, user: linux1, build_test_v8: yes} + rhel7-s390x-2: {ip: 148.100.86.117, user: linux1, build_test_v8: yes} + rhel7-s390x-3: {ip: 148.100.86.28, user: linux1, build_test_v8: yes} + rhel7-s390x-4: {ip: 148.100.86.94, user: linux1, build_test_v8: yes} ubuntu1804-x64-1: {ip: 52.117.26.14, alias: jenkins-workspace-6} - joyent: - smartos15-x64-3: {ip: 165.225.148.128} - smartos15-x64-4: {ip: 165.225.149.91} - smartos16-x64-3: {ip: 165.225.151.106} - smartos16-x64-4: {ip: 165.225.149.158} - smartos17-x64-3: {ip: 165.225.148.15} - smartos17-x64-4: {ip: 165.225.148.16} - smartos18-x64-3: {ip: 165.225.151.114} - smartos18-x64-4: {ip: 165.225.149.13} - ubuntu1804_docker-x64-1: {ip: 165.225.151.201, user: ubuntu} - ubuntu1804-x64-1: {ip: 165.225.149.88, user: ubuntu} + smartos17-x64-3: {ip: 147.75.88.59} + smartos17-x64-4: {ip: 147.75.88.61} + smartos18-x64-3: {ip: 147.75.88.54} + smartos18-x64-4: {ip: 147.75.88.55} + ubuntu1804-x64-1: {ip: 147.75.88.51, user: ubuntu} + + - macstadium: + macos11.0-arm64-3: + ansible_python_interpreter: /usr/bin/python3 + ip: 207.254.38.86 + user: administrator + remote_env: + PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin + macos11.0-arm64-4: + ansible_python_interpreter: /usr/bin/python3 + ip: 207.254.38.89 + user: administrator + remote_env: + PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin - marist: - zos13-s390x-1: - ip: 148.100.36.133 - user: Unix1 + zos24-s390x-1: + ip: 148.100.36.155 + user: unix1 + ansible_python_interpreter: /rsusr/rocket/python-2017-04-12-py27/python27/bin/python + become_method: su + cmake_path_env: "{{ home }}/{{ server_user }}:/rsusr/rocket/bin:/bin" + git_cmd: /rsusr/rocket/bin/git remote_env: - LIBPATH: /lib:/usr/lib:.:/NODEJS2/lib/perl5/5.24.0/os390/CORE.pod:/NODEJS2/python-2017-04-12-py27/python27/lib/ - PATH: /NODEJS2/python-2017-04-12-py27/python27/bin:/bin:/NODEJS2/bin:/NODEJS/bin + LIBPATH: /lib:/usr/lib:.:/rsusr/rocket/lib/perl5/5.24.0/os390/CORE.pod:/rsusr/rocket/python-2017-04-12-py27/python27/lib/ + PATH: /rsusr/rocket/python-2017-04-12-py27/python27/bin:/bin:/rsusr/rocket/bin + SSL_CERT_FILE: "{{ home }}/{{ server_user }}/ca-bundle.crt" server_jobs: 4 - zos13-s390x-2: - ip: 148.100.36.134 - user: Unix1 + zos24-s390x-2: + ip: 148.100.36.156 + user: unix1 + ansible_python_interpreter: /rsusr/rocket/python-2017-04-12-py27/python27/bin/python + become_method: su + cmake_path_env: "{{ home }}/{{ server_user }}:/rsusr/rocket/bin:/bin" + git_cmd: /rsusr/rocket/bin/git remote_env: - LIBPATH: /lib:/usr/lib:.:/NODEJS2/lib/perl5/5.24.0/os390/CORE.pod:/NODEJS2/python-2017-04-12-py27/python27/lib/ - PATH: /NODEJS2/python-2017-04-12-py27/python27/bin:/bin:/NODEJS2/bin:/NODEJS/bin + LIBPATH: /lib:/usr/lib:.:/rsusr/rocket/lib/perl5/5.24.0/os390/CORE.pod:/rsusr/rocket/python-2017-04-12-py27/python27/lib/ + PATH: /rsusr/rocket/python-2017-04-12-py27/python27/bin:/bin:/rsusr/rocket/bin + SSL_CERT_FILE: "{{ home }}/{{ server_user }}/ca-bundle.crt" server_jobs: 4 - - mininodes: - ubuntu1604-arm64_odroid_c2-1: {ip: 70.167.220.147} - ubuntu1604-arm64_odroid_c2-2: {ip: 70.167.220.148} - ubuntu1604-arm64_odroid_c2-3: {ip: 70.167.220.149, user: odroid} - - - macstadium: - macos10.10-x64-1: {ip: 207.254.58.162, port: 10005, user: administrator} - macos10.10-x64-2: {ip: 207.254.58.162, port: 10006, user: administrator} - macos10.11-x64-1: {ip: 207.254.58.162, port: 10003, user: administrator} - macos10.11-x64-2: {ip: 207.254.58.162, port: 10004, user: administrator} - macos10.12-x64-1: {ip: 207.254.58.162, port: 10001, user: administrator} - macos10.12-x64-2: {ip: 207.254.58.162, port: 10002, user: administrator} - - msft: win10_vs2017-arm64-1: {} win10_vs2017-arm64-2: {} - nearform: - macos10.15-x64-1: {ip: 83.147.191.70, user: administrator} - macos10.15-x64-2: {ip: 83.147.191.71, user: administrator} - macos10.15-x64-3: {ip: 83.147.191.72, user: administrator} + macos10.15-x64-1: + ip: 83.147.191.70 + user: administrator + ansible_python_interpreter: /usr/bin/python3 + macos10.15-x64-2: + ip: 83.147.191.71 + user: administrator + ansible_python_interpreter: /usr/bin/python3 + macos10.15-x64-3: + ip: 83.147.191.72 + user: administrator + ansible_python_interpreter: /usr/bin/python3 + macos11.0-arm64-1: + ansible_python_interpreter: /usr/bin/python3 + ip: 83.147.191.75 + user: admin + remote_env: + PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin intel-ubuntu1604-x64-1: {ip: 92.51.196.114} intel-ubuntu1604-x64-2: {ip: 92.51.196.115} @@ -199,11 +245,31 @@ hosts: centos7-ppc64_le-4: {ip: 140.211.168.194, user: centos, build_test_v8: yes} - orka: - macos10.15-x64-1: {ip: 199.7.167.100, port: 8823, user: administrator} - macos10.15-x64-2: {ip: 199.7.167.99, port: 8823, user: administrator} - macos10.14-x64-1: {ip: 199.7.167.99, port: 8822, user: administrator} - macos10.14-x64-2: {ip: 199.7.167.100, port: 8824, user: administrator} - macos10.14-x64-3: {ip: 199.7.167.101, port: 8824, user: administrator} + macos10.15-x64-1: + ansible_python_interpreter: /usr/bin/python3 + ip: 199.7.167.100 + port: 8823 + user: administrator + macos10.15-x64-2: + ansible_python_interpreter: /usr/bin/python3 + ip: 199.7.167.99 + port: 8823 + user: administrator + macos10.14-x64-1: + ansible_python_interpreter: /usr/local/bin/python3 + ip: 199.7.167.99 + port: 8822 + user: administrator + macos10.14-x64-2: + ansible_python_interpreter: /usr/local/bin/python3 + ip: 199.7.167.100 + port: 8824 + user: administrator + macos10.14-x64-3: + ansible_python_interpreter: /usr/local/bin/python3 + ip: 199.7.167.101 + port: 8824 + user: administrator - iinthecloud: ibmi73-ppc64_be-1: {ip: 65.183.160.52, user: nodejs} @@ -218,8 +284,8 @@ hosts: - rackspace: centos7-x64-1: {ip: 119.9.27.82} debian8-x64-1: {ip: 23.253.109.216} - debian8-x64-2: {ip: 104.239.140.184} - fedora27-x64-1: {ip: 119.9.51.79} + debian10-x64-1: {ip: 104.239.140.184} + fedora32-x64-1: {ip: 119.9.51.79} ubuntu1604-x64-1: {ip: 119.9.51.176} ubuntu1604-x64-2: {ip: 104.130.124.194} win2012r2_vs2013-x64-1: {ip: 104.239.174.165} @@ -276,23 +342,12 @@ hosts: piccoloaiutante-debian10-arm64_pi3-1: {ip: 192.168.2.89, user: pi, alias: iojs-ns-pi3-10 } kahwee-debian10-arm64_pi3-1: {ip: 192.168.2.90, user: pi, alias: iojs-ns-pi3-11 } - rvagg-ubuntu1404-arm64_odroidxu3-1: {ip: 192.168.2.10, user: odroid} - rvagg-ubuntu1404-arm64_odroidxu-1: {ip: 192.168.2.15} - rvagg-ubuntu1404-arm64_odroidxu-2: {ip: 192.168.2.16} - - osx1010-x64-1: {ip: 192.168.2.210, user: iojs} - - - scaleway: - ubuntu1804-armv7l-1: {ip: 212.47.233.202} - ubuntu1804-armv7l-2: {ip: 212.47.246.3} - ubuntu1804-armv7l-3: {ip: 212.47.227.202} - - softlayer: centos6-x64-1: {ip: 169.61.75.51} centos6-x64-2: {ip: 169.61.75.58} centos7-x64-1: {ip: 50.23.85.250} - debian8-x86-1: {ip: 169.44.16.126} - debian9-x64-1: {ip: 169.60.150.91} + debian9-x64-1: {ip: 169.60.150.88} + debian10-x64-1: {ip: 169.44.16.126} ubuntu1404-x64-1: {ip: 50.97.245.5} ubuntu1404-x86-1: {ip: 50.97.245.9} ubuntu1804_docker-x64-1: {ip: 52.117.26.9} diff --git a/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy index cd1ebdeac..53f260c5f 100644 --- a/jenkins/scripts/VersionSelectorScript.groovy +++ b/jenkins/scripts/VersionSelectorScript.groovy @@ -35,6 +35,7 @@ def buildExclusions = [ [ /^ubuntu1404-64/, anyType, gte(12) ], [ /^ubuntu1604-32/, anyType, gte(10) ], // 32-bit linux for <10 only [ /^ubuntu1604-64/, anyType, gte(16) ], + [ /^ubuntu2004-64/, anyType, lt(13) ], // Ubuntu 20 doesn't have Python 2 [ /^alpine-latest-x64$/, anyType, lt(13) ], // Alpine 3.12 doesn't have Python 2 // Linux PPC LE ------------------------------------------ From f70db4cb490aaf49a09ee27c2dc7c3d564b9a238 Mon Sep 17 00:00:00 2001 From: Stewart X Addison <6487691+sxa@users.noreply.github.com> Date: Thu, 26 Aug 2021 17:38:42 +0100 Subject: [PATCH 3/6] Update ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2 Co-authored-by: Richard Lau --- ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2 index fa0aef602..df7eefbef 100644 --- a/ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 ENV LC_ALL C ENV USER {{ server_user }} From 9cfba1f56f6dc55d48a9ac1f18f8eb8ca083d8a3 Mon Sep 17 00:00:00 2001 From: Stewart X Addison <6487691+sxa@users.noreply.github.com> Date: Thu, 26 Aug 2021 17:40:37 +0100 Subject: [PATCH 4/6] Update nodejs_yaml.py --- ansible/plugins/inventory/nodejs_yaml.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/plugins/inventory/nodejs_yaml.py b/ansible/plugins/inventory/nodejs_yaml.py index 949083d6a..944fad1b7 100755 --- a/ansible/plugins/inventory/nodejs_yaml.py +++ b/ansible/plugins/inventory/nodejs_yaml.py @@ -1,4 +1,4 @@ -#!/usr/bin/env /usr/local/bin/python3 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # Copyright Node.js contributors. All rights reserved. From 4309dc4db22a0a21a0591c14e777a349fe959fb0 Mon Sep 17 00:00:00 2001 From: Stewart X Addison <6487691+sxa@users.noreply.github.com> Date: Thu, 26 Aug 2021 17:41:26 +0100 Subject: [PATCH 5/6] Update ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 Co-authored-by: Richard Lau --- .../roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 index 658f2c83b..9d1f87709 100644 --- a/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 ENV LC_ALL C ENV USER {{ server_user }} From 5670d5e4b0da9b9b0e3e4d36cf80768ff6d2a74f Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Fri, 27 Aug 2021 15:22:11 +0100 Subject: [PATCH 6/6] Add templating for ARCH and DESTCPU variables Signed-off-by: Stewart X Addison --- ansible/roles/docker/templates/alpine311.Dockerfile.j2 | 4 ++-- ansible/roles/docker/templates/alpine312.Dockerfile.j2 | 4 ++-- ansible/roles/docker/templates/ubi81.Dockerfile.j2 | 4 ++-- ansible/roles/docker/templates/ubuntu1604.Dockerfile.j2 | 4 ++-- .../roles/docker/templates/ubuntu1604_arm_cross.Dockerfile.j2 | 4 ++-- ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2 | 4 ++-- .../roles/docker/templates/ubuntu1804_arm_cross.Dockerfile.j2 | 4 ++-- .../docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 | 4 ++-- ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2 | 4 ++-- .../docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ansible/roles/docker/templates/alpine311.Dockerfile.j2 b/ansible/roles/docker/templates/alpine311.Dockerfile.j2 index d5c63ff4e..a550acb1e 100644 --- a/ansible/roles/docker/templates/alpine311.Dockerfile.j2 +++ b/ansible/roles/docker/templates/alpine311.Dockerfile.j2 @@ -10,8 +10,8 @@ ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe ENV NODE_TEST_DIR /home/{{ server_user }}/tmp ENV OSTYPE linux-gnu ENV OSVARIANT docker -ENV DESTCPU x64 -ENV ARCH x64 +ENV DESTCPU {{ arch }} +ENV ARCH {{ arch }} RUN apk add --no-cache --upgrade apk-tools diff --git a/ansible/roles/docker/templates/alpine312.Dockerfile.j2 b/ansible/roles/docker/templates/alpine312.Dockerfile.j2 index c977bcd61..2581faff7 100644 --- a/ansible/roles/docker/templates/alpine312.Dockerfile.j2 +++ b/ansible/roles/docker/templates/alpine312.Dockerfile.j2 @@ -10,8 +10,8 @@ ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe ENV NODE_TEST_DIR /home/{{ server_user }}/tmp ENV OSTYPE linux-gnu ENV OSVARIANT docker -ENV DESTCPU x64 -ENV ARCH x64 +ENV DESTCPU {{ arch }} +ENV ARCH {{ arch }} RUN apk add --no-cache --upgrade apk-tools diff --git a/ansible/roles/docker/templates/ubi81.Dockerfile.j2 b/ansible/roles/docker/templates/ubi81.Dockerfile.j2 index 4a26499a4..eeb8db548 100644 --- a/ansible/roles/docker/templates/ubi81.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubi81.Dockerfile.j2 @@ -9,8 +9,8 @@ ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe ENV NODE_TEST_DIR /home/{{ server_user }}/tmp ENV OSTYPE linux-gnu ENV OSVARIANT docker -ENV DESTCPU x64 -ENV ARCH x64 +ENV DESTCPU {{ arch }} +ENV ARCH {{ arch }} # ccache is not in the default repositories so get it from EPEL 8. RUN dnf install --disableplugin=subscription-manager -y \ diff --git a/ansible/roles/docker/templates/ubuntu1604.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1604.Dockerfile.j2 index 152accb0f..87a8ff7c5 100644 --- a/ansible/roles/docker/templates/ubuntu1604.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu1604.Dockerfile.j2 @@ -10,8 +10,8 @@ ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe ENV NODE_TEST_DIR /home/{{ server_user }}/tmp ENV OSTYPE linux-gnu ENV OSVARIANT docker -ENV DESTCPU x64 -ENV ARCH x64 +ENV DESTCPU {{ arch }} +ENV ARCH {{ arch }} RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \ ccache \ diff --git a/ansible/roles/docker/templates/ubuntu1604_arm_cross.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1604_arm_cross.Dockerfile.j2 index 59bd90cc0..378b9bf21 100644 --- a/ansible/roles/docker/templates/ubuntu1604_arm_cross.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu1604_arm_cross.Dockerfile.j2 @@ -50,8 +50,8 @@ ENV USER={{ server_user }} \ NODE_TEST_DIR=/home/{{ server_user }}/tmp \ OSTYPE=linux-gnu \ OSVARIANT=docker \ - DESTCPU=x64 \ - ARCH=x64 \ + DESTCPU={{ arch }} \ + ARCH={{ arch }} \ CCACHE_TEMPDIR=/home/{{ server_user }}/.ccache/{{ item.name }} CMD cd /home/{{ server_user }} \ diff --git a/ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2 index badbf33b6..ec5655eac 100644 --- a/ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2 @@ -10,8 +10,8 @@ ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe ENV NODE_TEST_DIR /home/{{ server_user }}/tmp ENV OSTYPE linux-gnu ENV OSVARIANT docker -ENV DESTCPU x64 -ENV ARCH x64 +ENV DESTCPU {{ arch }} +ENV ARCH {{ arch }} RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \ ccache \ diff --git a/ansible/roles/docker/templates/ubuntu1804_arm_cross.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1804_arm_cross.Dockerfile.j2 index fbba85e56..7aaccb6dc 100644 --- a/ansible/roles/docker/templates/ubuntu1804_arm_cross.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu1804_arm_cross.Dockerfile.j2 @@ -51,8 +51,8 @@ ENV USER={{ server_user }} \ NODE_TEST_DIR=/home/{{ server_user }}/tmp \ OSTYPE=linux-gnu \ OSVARIANT=docker \ - DESTCPU=x64 \ - ARCH=x64 \ + DESTCPU={{ arch }} \ + ARCH={{ arch }} \ CCACHE_TEMPDIR=/home/{{ server_user }}/.ccache/{{ item.name }} CMD cd /home/{{ server_user }} \ diff --git a/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 index a30796940..4661d020c 100644 --- a/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 @@ -10,8 +10,8 @@ ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe ENV NODE_TEST_DIR /home/{{ server_user }}/tmp ENV OSTYPE linux-gnu ENV OSVARIANT docker -ENV DESTCPU x64 -ENV ARCH x64 +ENV DESTCPU {{ arch }} +ENV ARCH {{ arch }} ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get install apt-utils -y && \ diff --git a/ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2 index df7eefbef..09a0dc94d 100644 --- a/ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2 @@ -10,8 +10,8 @@ ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe ENV NODE_TEST_DIR /home/{{ server_user }}/tmp ENV OSTYPE linux-gnu ENV OSVARIANT docker -ENV DESTCPU x64 -ENV ARCH x64 +ENV DESTCPU {{ arch }} +ENV ARCH {{ arch }} RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \ ccache \ diff --git a/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 index 9d1f87709..f17290066 100644 --- a/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 @@ -10,8 +10,8 @@ ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe ENV NODE_TEST_DIR /home/{{ server_user }}/tmp ENV OSTYPE linux-gnu ENV OSVARIANT docker -ENV DESTCPU x64 -ENV ARCH x64 +ENV DESTCPU {{ arch }} +ENV ARCH {{ arch }} ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get install apt-utils -y && \