Skip to content

Commit fa69d8e

Browse files
authored
ansible: add RHEL 8 x64 instances (#2886)
Add RHEL 8 x64 instances, including repurposing some obsolete CentOS 6 instances which are no longer used by any CI jobs. Add: - release-digitalocean-rhel8-x64-1 - release-ibm-rhel8-x64-1 - release-ibm-rhel8-x64-2 - test-digitalocean-rhel8-x64-1 - test-ibm-rhel8-x64-1 - test-ibm-rhel8-x64-2 - test-ibm-rhel8-x64-3 Remove: - release-digitalocean-centos6-x86-1 - release-softlayer-centos6-x64-1 - test-digitalocean-ubuntu1404-x86-1 - test-softlayer-centos6-x64-1 - test-softlayer-centos6-x64-2 Refs: #2741 Refs: #2815
1 parent c5cdd41 commit fa69d8e

File tree

9 files changed

+73
-12
lines changed

9 files changed

+73
-12
lines changed

ansible/group_vars/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ jenkins_url: "https://ci-release.nodejs.org"
33
jenkins_worker_jar: "https://ci.nodejs.org/jnlpJars/slave.jar"
44
server_user: "iojs"
55
home: "/home"
6+
git_reference_path: "{{ home }}/{{ server_user }}/.ccache/node.shared.reference"
67
remote_env: {}

ansible/group_vars/test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ jenkins_url: "https://ci.nodejs.org"
22
jenkins_worker_jar: "{{ jenkins_url }}/jnlpJars/slave.jar"
33
server_user: iojs
44
home: "/home"
5+
git_reference_path: "{{ home }}/{{ server_user }}/git/io.js.reference"
56
remote_env: {}

ansible/inventory.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ hosts:
3535
- release:
3636

3737
- digitalocean:
38-
centos6-x86-1: {ip: 162.243.248.28}
3938
centos7-x64-1: {ip: 138.68.12.105}
39+
rhel8-x64-1: {ip: 159.203.115.217}
4040

4141
- equinix:
4242
centos7-arm64-1: {ip: 139.178.85.110, server_jobs: 32}
@@ -47,6 +47,8 @@ hosts:
4747
server_jobs: 6
4848
rhel7-s390x-1: {ip: 148.100.86.101, user: linux1}
4949
rhel8-s390x-1: {ip: 148.100.84.27, user: linux1}
50+
rhel8-x64-1: {ip: 169.62.77.228}
51+
rhel8-x64-2: {ip: 50.97.245.10}
5052

5153
- iinthecloud:
5254
ibmi73-ppc64_be-1: {ip: 65.183.160.62, user: nodejs}
@@ -100,12 +102,6 @@ hosts:
100102
rvagg-debian10-armv6l_pi1p-1: {ip: 192.168.2.40, user: pi, alias: iojs-ns-pi1p-1 }
101103
andineck-debian10-armv6l_pi1p-1: {ip: 192.168.2.41, user: pi, alias: iojs-ns-pi1p-2 }
102104

103-
- softlayer:
104-
centos6-x64-1: {ip: 50.97.245.10}
105-
106-
107-
108-
109105

110106

111107
- test:
@@ -130,8 +126,8 @@ hosts:
130126
fedora34-x64-2: {ip: 159.203.98.84}
131127
freebsd12-x64-1: {ip: 45.55.90.237, user: freebsd}
132128
freebsd12-x64-2: {ip: 107.170.28.213, user: freebsd}
129+
rhel8-x64-1: {ip: 161.35.139.78, build_test_v8: yes}
133130
ubuntu1404-x64-1: {ip: 45.55.252.223}
134-
ubuntu1404-x86-1: {ip: 159.203.115.220}
135131
ubuntu1604-x86-1: {ip: 159.203.77.233}
136132
ubuntu1604-x86-2: {ip: 104.131.191.135}
137133
ubuntu1804_docker-x64-1: {ip: 134.209.55.216}
@@ -157,6 +153,9 @@ hosts:
157153
rhel8-s390x-2: {ip: 148.100.84.240, user: linux1, build_test_v8: yes}
158154
rhel8-s390x-3: {ip: 148.100.84.56, user: linux1, build_test_v8: yes}
159155
rhel8-s390x-4: {ip: 148.100.84.150, user: linux1, build_test_v8: yes}
156+
rhel8-x64-1: {ip: 169.61.75.51, build_test_v8: yes}
157+
rhel8-x64-2: {ip: 169.61.75.58, build_test_v8: yes}
158+
rhel8-x64-3: {ip: 52.117.26.13, build_test_v8: yes}
160159
ubuntu1804-x64-1: {ip: 52.117.26.14, alias: jenkins-workspace-6}
161160
ubuntu1804-x64-2: {ip: 50.97.245.9}
162161

@@ -361,8 +360,6 @@ hosts:
361360
kahwee-debian10-arm64_pi3-1: {ip: 192.168.2.90, user: pi, alias: iojs-ns-pi3-11 }
362361

363362
- softlayer:
364-
centos6-x64-1: {ip: 169.61.75.51}
365-
centos6-x64-2: {ip: 169.61.75.58}
366363
centos7-x64-1: {ip: 50.23.85.250}
367364
debian9-x64-1: {ip: 169.60.150.88}
368365
debian10-x64-1: {ip: 169.44.16.126}

ansible/roles/bootstrap/tasks/partials/rhel8.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
# Red Hat Enterprise Linux 8
44

5+
# Set the hostname as it will be used by subscription manager.
6+
- name: gather facts
7+
setup:
8+
9+
- name: set hostname
10+
ansible.builtin.hostname:
11+
name: "{{ inventory_hostname | regex_replace('_', '--') }}"
12+
513
- name: register Red Hat subscription
614
community.general.redhat_subscription:
715
activationkey: "{{ type }}"
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
3+
#
4+
# Install packages for V8 builds.
5+
#
6+
7+
# V8 builds still require Python 2.
8+
- name: install packages required to build V8
9+
ansible.builtin.dnf:
10+
name: ['python2', 'python2-pip']
11+
state: present
12+
13+
- name: update python package alternatives
14+
community.general.alternatives:
15+
link: /usr/bin/python
16+
name: python
17+
path: /usr/bin/python2
18+
19+
- name: install dependencies for V8 build tools (Python 2)
20+
ansible.builtin.pip:
21+
executable: pip2
22+
name: ['httplib2', 'six']
23+
state: present
24+
25+
- name: install dependencies for V8 build tools (Python 3)
26+
ansible.builtin.pip:
27+
executable: pip-3
28+
name: ['httplib2', 'six']
29+
state: present

ansible/roles/java-base/tasks/main.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,13 @@
3939

4040
- name: install java
4141
when:
42-
- java.rc > 0
4342
- not os|startswith("zos")
4443
- not os|startswith("macos")
44+
notify:
45+
- restart Jenkins
4546
package:
4647
name: "{{ java_package_name }}"
47-
state: present
48+
state: latest
4849
use: "{{ os|startswith(\"ibmi\")|ternary(\"yum\", omit) }}"
4950

5051
- name: install java tap (macOS)
@@ -144,6 +145,8 @@
144145
src: "/opt/{{ adoptopenjdk_unpacked.files[0].split('/')[0] }}/bin/java"
145146
dest: "/usr/bin/java"
146147
state: link
148+
notify:
149+
- restart Jenkins
147150
when:
148151
- use_adoptopenjdk == True
149152
- update_adoptopenjdk == True

ansible/roles/jenkins-worker/tasks/main.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,25 @@
208208
runAsciiBashExists.stat.exists == False
209209
shell: "sh {{ home }}/{{ server_user }}/gen_runAsciiBash.sh"
210210

211+
# We should probably create a git reference repository for all hosts but
212+
# limit for now to newer ones where we know we have enough disk space.
213+
- name: create directory for git reference repository
214+
ansible.builtin.file:
215+
group: "{{ server_user }}"
216+
owner: "{{ server_user }}"
217+
path: "{{ git_reference_path | dirname }}"
218+
state: directory
219+
when: os == 'rhel8'
220+
221+
- name: create git reference repository
222+
ansible.builtin.command:
223+
chdir: "{{ git_reference_path | dirname }}"
224+
cmd: git clone --mirror https://github.com/nodejs/node "{{ git_reference_path | basename }}"
225+
creates: "{{ git_reference_path }}"
226+
become: yes
227+
become_user: "{{ server_user }}"
228+
when: os == 'rhel8'
229+
211230
- name: render init script into place
212231
notify: restart Jenkins
213232
template:

jenkins/scripts/VersionSelectorScript.groovy

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ def buildExclusions = [
2727
[ /^centos7-(arm)?(64)-gcc8/, anyType, lt(14) ], // 14.x: gcc8 builds start
2828
[ /^centos6-32-gcc6/, releaseType, gte(10) ], // 32-bit linux for <10 only
2929
[ /^centos7-64/, releaseType, lt(12) ],
30+
[ /^centos7-64/, releaseType, gte(18) ],
3031
[ /debian8-x86/, anyType, gte(10) ], // 32-bit linux for <10 only
3132
[ /debian8/, anyType, gte(13) ],
3233
[ /debian9/, anyType, gte(16) ],
@@ -129,6 +130,8 @@ def buildExclusions = [
129130

130131
// Source / headers / docs -------------------------------
131132
[ /^centos7-release-sources$/, releaseType, lt(10) ],
133+
[ /^centos7-release-sources$/, releaseType, gte(18) ],
134+
[ /^rhel8-release-sources$/, releaseType, lt(18) ],
132135

133136
// -------------------------------------------------------
134137
]

0 commit comments

Comments
 (0)