Skip to content

Commit 45137d5

Browse files
authored
ansible: add new OSUOSL arm64 release machines (#3051)
Add two new OSUOSL hosted arm64 release machines to replace the Equinix ones that are going away at the end of November 2022. Updates the playbook for centos7 to drop devtoolset-6 which is no longer required since Node.js 12 went End-of-Life (Node.js 14 and 16 use devtoolset-8 and Node.js 18 and later are not built on centos7). Refs: #3028
1 parent e61ec8f commit 45137d5

3 files changed

Lines changed: 5 additions & 25 deletions

File tree

ansible/inventory.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ hosts:
8787
aix72-ppc64_be-1:
8888
ip: 140.211.9.77
8989
server_jobs: 6
90+
centos7-arm64-1: {ip: 140.211.169.7, server_jobs: 2, user: centos}
9091
centos7-ppc64_le-1: {ip: 140.211.168.61, user: centos}
92+
rhel8-arm64-1: {ip: 140.211.169.58, server_jobs: 2, user: cloud-user}
9193
rhel8-ppc64_le-1: {ip: 140.211.168.185, user: cloud-user}
9294

9395
- orka:

ansible/roles/baselayout/vars/main.yml

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -43,36 +43,12 @@ packages: {
4343
# partials/repo/centos7.yml for arm64
4444
centos7_arm64: [
4545
'git,python3', # git2u not available for aarch64 (yet)
46-
'https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-runtime-6.1-1.el7.aarch64.rpm,
47-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-elfutils-libs-0.168-3.el7.aarch64.rpm,
48-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-systemtap-runtime-3.0-8s.el7.aarch64.rpm,
49-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-ltrace-0.7.91-17.el7.aarch64.rpm,
50-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-strace-4.12-3.el7.aarch64.rpm,
51-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-systemtap-client-3.0-8s.el7.aarch64.rpm,
52-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-gcc-gfortran-6.3.1-3.1.el7.aarch64.rpm,
53-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-binutils-2.27-12.el7.1.aarch64.rpm,
54-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-elfutils-libelf-0.168-3.el7.aarch64.rpm,
55-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-elfutils-0.168-3.el7.aarch64.rpm,
56-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-gdb-7.12.1-48.el7.aarch64.rpm,
57-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-make-4.1-3.el7.aarch64.rpm,
58-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-gcc-c++-6.3.1-3.1.el7.aarch64.rpm,
59-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-memstomp-0.1.5-5.el7.aarch64.rpm,
60-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-dwz-0.12-1.el7.aarch64.rpm,
61-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-systemtap-3.0-8s.el7.aarch64.rpm,
62-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-toolchain-6.1-1.el7.aarch64.rpm,
63-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-gcc-6.3.1-3.1.el7.aarch64.rpm,
64-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-valgrind-3.12.0-1.el7.aarch64.rpm,
65-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-libstdc++-devel-6.3.1-3.1.el7.aarch64.rpm,
66-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-oprofile-1.1.0-4.el7.aarch64.rpm,
67-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-systemtap-devel-3.0-8s.el7.aarch64.rpm,
68-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-perftools-6.1-1.el7.aarch64.rpm,
69-
https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-6.1-1.el7.aarch64.rpm',
7046
],
7147
centos7_x64: ['devtoolset-6-libatomic-devel,git222,centos-release-scl,python3'],
7248
centos7_ppc64: ['cmake3,glib2-devel,git,python3'],
7349

7450
centos7: [
75-
'bzip2-devel,openssl-devel,ccache,gcc-c++,devtoolset-6,sudo,zlib-devel,libffi-devel,devtoolset-8,devtoolset-8-libatomic-devel',
51+
'bzip2-devel,openssl-devel,ccache,gcc-c++,sudo,zlib-devel,libffi-devel,devtoolset-8,devtoolset-8-libatomic-devel',
7652
],
7753

7854
aix: [

ansible/roles/jenkins-worker/templates/systemd.service.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Environment="PATH=/home/{{ server_user }}/nghttp2/src:/home/{{ server_user }}/wr
2222
Environment="NODE_COMMON_PIPE=/home/{{ server_user }}/test.pipe"
2323
Environment="NODE_TEST_DIR=/home/{{ server_user }}/tmp"
2424
Environment="OSTYPE=linux-gnu"
25+
Environment="DESTCPU={{ arch }}"
26+
Environment="ARCH={{ arch }}"
2527

2628
ExecStart=/usr/bin/java -Xmx{{ server_ram|default('128m') }} \
2729
-jar /home/{{ server_user }}/slave.jar \

0 commit comments

Comments
 (0)