Skip to content

Commit 175776e

Browse files
UlisesGasconUlisesGascon
authored
Merge branch 'main' into feat/inventory-remove-orka-release
2 parents 1343b7d + 7a568fd commit 175776e

File tree

80 files changed

+2858
-960
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+2858
-960
lines changed

‎.github/workflows/check_assets-tool.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Run tests for check_assets
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- '.github/workflows/check_assets-tool.yml'
7+
- 'ansible/www-standalone/tools/promote/expected_assets/*'
8+
- 'ansible/www-standalone/tools/promote/check_assets*'
9+
- 'ansible/www-standalone/tools/promote/check_r2_assets*'
10+
- 'ansible/www-standalone/tools/promote/test/**'
11+
push:
12+
paths:
13+
- '.github/workflows/check_assets-tool.yml'
14+
- 'ansible/www-standalone/tools/promote/expected_assets/*'
15+
- 'ansible/www-standalone/tools/promote/check_assets*'
16+
- 'ansible/www-standalone/tools/promote/check_r2_assets*'
17+
- 'ansible/www-standalone/tools/promote/test/**'
18+
schedule:
19+
- cron: 0 0 * * *
20+
workflow_dispatch:
21+
22+
permissions:
23+
contents: read
24+
25+
env:
26+
# This needs to match the version of Node.js on www.
27+
NODE_VERSION: 22
28+
29+
jobs:
30+
run-tests:
31+
runs-on: ubuntu-latest
32+
steps:
33+
- name: Checkout current repository
34+
uses: actions/checkout@v4
35+
with:
36+
persist-credentials: false
37+
- name: Use Node.js ${{ env.NODE_VERSION }}
38+
uses: actions/setup-node@v4
39+
with:
40+
node-version: ${{ env.NODE_VERSION }}
41+
- name: Run tests
42+
run: node --test --experimental-test-module-mocks
43+
working-directory: ansible/www-standalone/tools/promote/

‎.github/workflows/orka-templates.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: Check ORKA Packer Templates
2+
3+
on:
4+
push:
5+
paths:
6+
- 'orka/**/*.pkr.hcl'
7+
pull_request:
8+
paths:
9+
- 'orka/**/*.pkr.hcl'
10+
11+
permissions:
12+
contents: read
13+
14+
jobs:
15+
validate:
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- name: Checkout repository
20+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
21+
22+
- name: Set up Packer
23+
uses: hashicorp/setup-packer@1aa358be5cf73883762b302a3a03abd66e75b232 #v3.1.0
24+
25+
- name: Initialize Packer
26+
run: |
27+
for file in $(find . -name '*.pkr.hcl'); do
28+
echo "Initializing $file"
29+
packer init $file || exit 1
30+
done
31+
working-directory: orka/templates
32+
33+
- name: Validate Packer templates
34+
env:
35+
ORKA_ENDPOINT: 'https://mock-orka-endpoint'
36+
ORKA_AUTH_TOKEN: 'mock-orka-auth-token'
37+
SSH_DEFAULT_USERNAME: 'mock-ssh-default-username'
38+
SSH_DEFAULT_PASSWORD: 'mock-ssh-default-password'
39+
SSH_TEST_PASSWORD: 'mock-ssh-test-password'
40+
SSH_RELEASE_PASSWORD: 'mock-ssh-release-password'
41+
SSH_TEST_PUBLIC_KEY: 'mock-ssh-test-public-key'
42+
SSH_RELEASE_PUBLIC_KEY: 'mock-ssh-release-public-key'
43+
run: |
44+
for file in $(find . -name '*.pkr.hcl'); do
45+
echo "Validating $file"
46+
vars="-var orka_endpoint=$ORKA_ENDPOINT -var orka_auth_token=$ORKA_AUTH_TOKEN -var ssh_default_username=$SSH_DEFAULT_USERNAME"
47+
48+
if echo "$file" | grep -q "release"; then
49+
vars="$vars -var ssh_release_password=$SSH_RELEASE_PASSWORD -var ssh_release_public_key=$SSH_RELEASE_PUBLIC_KEY"
50+
elif echo "$file" | grep -q "test"; then
51+
vars="$vars -var ssh_test_password=$SSH_TEST_PASSWORD -var ssh_test_public_key=$SSH_TEST_PUBLIC_KEY -var ssh_default_password=$SSH_DEFAULT_PASSWORD"
52+
fi
53+
54+
packer validate $vars $file || exit 1
55+
done
56+
working-directory: orka/templates

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,6 @@ ansible/host_vars/*
1414
!ansible/host_vars/*-template
1515
.venv
1616
Pipfile.lock
17+
18+
# Orka secrets files including naming mutations
19+
orka/*/.env*

‎GOVERNANCE.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ should be aware of the bounds of their expertise and act accordingly.
5656
the basics of a trust relationship. The most two most straightforward paths
5757
to trust are:
5858
1. An established relationship with the Node.js project and its associated
59-
working groups and activities. The longer the better.
59+
working groups and activities. The longer the better. In case of doubt,
60+
or if the individual is _not_ a Node.js Collaborator, contact the Node.js
61+
TSC.
6062
2. A contractual relationship (such as employment) with a member company of
6163
the OpenJS Foundation. Contractual relationships carry legal weight and
6264
provide greater likelihood of a stable trust relationship; at a minimum

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ accesses and team roles see [GOVERNANCE.md][].
142142
### Emeriti
143143

144144
- [@addaleax](https://github.com/addaleax) - Anna Henningsen
145-
* [@anonrig](https://github.com/anonrig) - Yagiz Nizipli
145+
- [@anonrig](https://github.com/anonrig) - Yagiz Nizipli
146146
- [@bnoordhuis](https://github.com/bnoordhuis) - Ben Noordhuis
147147
- [@gibfahn](https://github.com/gibfahn) - Gibson Fahnestock
148148
- [@gireeshpunathil](https://github.com/gireeshpunathil) - Gireesh Punathil

‎ansible.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ ansible_python_interpreter = /opt/local/bin/python
2929

3030
[hosts:freebsd]
3131
ansible_python_interpreter = /usr/local/bin/python3
32+
ansible_shell_allow_world_readable_temp = True
3233

3334
[hosts:ibm]
3435
become_method = sudo

‎ansible/README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,15 +255,11 @@ Unsorted stuff of things we need to do/think about
255255
- [ ] move all service-related stuff to handlers
256256
- [ ] find a nicer way of adding proxyhosts to iptables
257257
- [ ] add clang/clang++ symlinks for ccache
258-
- [ ] centos7 needs different ccache path
259-
- [ ] debian7 needs to update alternative gcc/g++
260258
- [ ] verify that /usr/local/bin works as ccache install path
261259
- [x] remove subversion since v8 tests uses git nowadays
262260
- [ ] assign 192/256mb ram to the jenkins instances that requires it:
263261
- aix
264262
- TBD
265-
- [ ] epel-release for centos - required for centos7 on packet.net arm64
266-
before ccache can be installed
267263
- [x] make .ssh/config and .ssh/id_rsa for release machines, adding config
268264
for `node-www` and record host key for node-www
269265
- [ ] add explicit ARCH and DESTCPU for release machines (RV: I'm adding

‎ansible/inventory.yml

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ hosts:
1717
ubuntu2204-x64-1: {ip: 107.170.240.62, alias: ci}
1818

1919
- ibm:
20-
ubuntu1804-x64-1: {ip: 169.45.166.50, alias: ci-release}
2120
ubuntu2004-x64-1: {ip: 169.60.150.91, alias: ansible}
21+
ubuntu2404-x64-1: {ip: 169.61.75.62, alias: ci-release}
2222

2323
- joyent:
2424
debian10-x64-1: {ip: 147.28.162.110, alias: grafana}
@@ -53,8 +53,6 @@ hosts:
5353
ibmi73-ppc64_be-1: {ip: 65.183.160.62, user: nodejs}
5454

5555
- joyent:
56-
smartos18-x64-2: {ip: 147.28.162.101}
57-
smartos20-x64-2: {ip: 147.28.162.108}
5856
ubuntu1804_docker-x64-1: {ip: 147.28.162.104, user: ubuntu}
5957

6058
- macstadium:
@@ -76,7 +74,6 @@ hosts:
7674
aix72-ppc64_be-1:
7775
ip: 140.211.9.77
7876
server_jobs: 6
79-
centos7-arm64-1: {ip: 140.211.169.7, server_jobs: 2, user: centos}
8077
rhel8-arm64-1:
8178
ip: 140.211.169.58
8279
server_jobs: 2
@@ -108,19 +105,19 @@ hosts:
108105
- digitalocean:
109106
debian11-x64-1: {ip: 174.138.79.159, swap_file_size_mb: 2048}
110107
debian12-x64-1: {ip: 159.203.105.159, swap_file_size_mb: 2048}
111-
fedora39-x64-1: {ip: 159.203.117.50}
112-
fedora39-x64-2: {ip: 134.209.172.40}
113108
fedora40-x64-1: {ip: 159.65.248.149}
114109
fedora40-x64-2: {ip: 162.243.187.89}
115-
freebsd12-x64-1: {ip: 45.55.90.237, user: freebsd}
116-
freebsd12-x64-2: {ip: 107.170.28.213, user: freebsd}
110+
fedora41-x64-1: {ip: 165.227.191.35}
111+
fedora41-x64-2: {ip: 159.65.246.5}
112+
freebsd13-x64-1: {ip: 138.197.25.49, user: freebsd, swap_file_size_mb: 2048}
113+
freebsd13-x64-2: {ip: 159.89.188.229, user: freebsd, swap_file_size_mb: 2048}
117114
rhel8-x64-1: {ip: 161.35.139.78, build_test_v8: yes, swap_file_size_mb: 2048}
118115
rhel9-x64-1: {ip: 134.122.12.240, swap_file_size_mb: 2048}
119116
ubuntu2204_docker-x64-1: {ip: 134.209.55.216}
120117
ubuntu2204_docker-x64-2: {ip: 159.89.183.200}
121118
ubuntu1804-x64-1: {ip: 178.128.181.213}
122-
ubuntu2204-x64-1: {ip: 138.197.4.1}
123-
ubuntu2204-x64-2: {ip: 167.99.124.188}
119+
ubuntu2204-x64-1: {ip: 138.197.4.1, swap_file_size_mb: 2048}
120+
ubuntu2204-x64-2: {ip: 167.99.124.188, swap_file_size_mb: 2048}
124121

125122
- equinix:
126123
ubuntu2004_docker-arm64-1: {ip: 145.40.81.219}
@@ -152,8 +149,8 @@ hosts:
152149
rhel8-x64-2: {ip: 169.61.75.58, build_test_v8: yes}
153150
rhel8-x64-3: {ip: 52.117.26.13, build_test_v8: yes}
154151
rhel9-x64-1: {ip: 169.60.150.92, swap_file_size_mb: 2048}
152+
rhel9-x64-2: {ip: 169.44.168.2}
155153
ubuntu2204-x64-1: {ip: 169.60.150.82}
156-
ubuntu2204-x64-2: {ip: 169.44.168.2}
157154
# when adding, removing or changing the IPs for any
158155
# `jenkins-workspace-*` machine, remember to rerun
159156
# the `ansible/playbooks/create-github-bot.yml` playbook
@@ -162,10 +159,6 @@ hosts:
162159
ubuntu2204_docker-x64-1: {ip: 52.117.26.9}
163160

164161
- equinix_mnx:
165-
smartos18-x64-3: {ip: 147.28.162.102}
166-
smartos18-x64-4: {ip: 147.28.162.103}
167-
smartos20-x64-3: {ip: 147.28.162.107}
168-
smartos20-x64-4: {ip: 147.28.162.109}
169162
ubuntu1804-x64-1: {ip: 147.28.162.99, user: ubuntu}
170163

171164
- hetzner:
@@ -230,10 +223,23 @@ hosts:
230223
# to update the Jenkins worker IP allowlist in github-bot
231224
ubuntu2204-x64-1: {ip: 67.158.54.159, alias: jenkins-workspace-9}
232225
ubuntu2204-x64-2: {ip: 8.225.232.44, alias: jenkins-workspace-10}
233-
smartos21-x64-1: {ip: 8.225.232.135}
234-
smartos21-x64-2: {ip: 8.225.232.137}
235-
smartos23-x64-1: {ip: 8.225.232.134}
236-
smartos23-x64-2: {ip: 8.225.232.141}
226+
smartos22-x64-1:
227+
ip: 172.16.9.3
228+
ansible_ssh_common_args: '-o ProxyCommand="ssh -i ~/.ssh/nodejs_build_test -W %h:%p [email protected]"'
229+
ansible_user: root
230+
smartos22-x64-2:
231+
ip: 172.16.9.3
232+
ansible_ssh_common_args: '-o ProxyCommand="ssh -i ~/.ssh/nodejs_build_test -W %h:%p [email protected]"'
233+
ansible_user: root
234+
smartos23-x64-4:
235+
ip: 172.16.9.3
236+
ansible_ssh_common_args: '-o ProxyCommand="ssh -i ~/.ssh/nodejs_build_test -W %h:%p [email protected]"'
237+
ansible_user: root
238+
smartos23-x64-5:
239+
ip: 172.16.9.3
240+
ansible_ssh_common_args: '-o ProxyCommand="ssh -i ~/.ssh/nodejs_build_test -W %h:%p [email protected]"'
241+
ansible_user: root
242+
237243

238244
- osuosl:
239245
# secret for -1 was compromised, do not use -1 name
@@ -250,9 +256,10 @@ hosts:
250256
rhel8-ppc64_le-2: {ip: 140.211.168.76, user: cloud-user, build_test_v8: yes, swap_file_size_mb: 2048}
251257
rhel8-ppc64_le-3: {ip: 140.211.168.221, user: cloud-user, build_test_v8: yes, swap_file_size_mb: 2048}
252258
rhel8-ppc64_le-4: {ip: 140.211.168.194, user: cloud-user, build_test_v8: yes, swap_file_size_mb: 2048}
253-
rhel9-ppc64_le-1: {ip: 140.211.10.92, user: cloud-user, swap_file_size_mb: 2048}
254-
rhel9-ppc64_le-2: {ip: 140.211.10.69, user: cloud-user, swap_file_size_mb: 2048}
255-
rhel9-ppc64_le-3: {ip: 140.211.10.110, user: cloud-user, swap_file_size_mb: 2048}
259+
rhel9-ppc64_le-1: {ip: 140.211.10.105, user: cloud-user, swap_file_size_mb: 2048}
260+
rhel9-ppc64_le-2: {ip: 140.211.10.98, user: cloud-user, swap_file_size_mb: 2048}
261+
rhel9-ppc64_le-3: {ip: 140.211.10.102, user: cloud-user, swap_file_size_mb: 2048}
262+
rhel9-ppc64_le-4: {ip: 140.211.10.107, user: cloud-user, swap_file_size_mb: 2048}
256263
ubuntu2004_docker-arm64-1: {ip: 140.211.169.11, user: ubuntu}
257264

258265
- orka:
@@ -283,21 +290,19 @@ hosts:
283290
user: admin
284291

285292
- iinthecloud:
286-
ibmi73-ppc64_be-1: {ip: 65.183.160.52, user: nodejs}
287-
ibmi73-ppc64_be-2: {ip: 65.183.160.59, user: nodejs}
293+
ibmi74-ppc64_be-1: {ip: 65.183.160.52, user: nodejs}
294+
ibmi74-ppc64_be-2: {ip: 65.183.160.59, user: nodejs}
288295

289296
- rzkh:
290-
ibmi73-ppc64_be-1:
297+
ibmi74-ppc64_be-1:
291298
ip: 185.113.4.148
292299
user: nodejs
293300
server_jobs: 32
294301

295302
- rackspace:
296-
centos7-x64-1: {ip: 119.9.27.82}
297-
debian10-x64-1: {ip: 104.239.140.184}
298303
debian11-x64-1: {ip: 23.253.109.216, swap_file_size_mb: 4096}
299-
ubuntu1604-x64-1: {ip: 119.9.51.176}
300-
ubuntu1604-x64-2: {ip: 104.130.124.194}
304+
debian12-x64-1: {ip: 104.130.124.194, swap_file_size_mb: 4096}
305+
ubuntu2204-x64-1: {ip: 119.9.52.75, swap_file_size_mb: 4096, user: ubuntu}
301306
win2016_vs2015-x64-1: {}
302307
win2016_vs2015-x64-2: {}
303308
win2019_vs2019-x64-1: {}
@@ -312,5 +317,4 @@ hosts:
312317
win2022_vs2022-x64-6: {}
313318

314319
- softlayer:
315-
debian10-x64-1: {ip: 169.44.16.126}
316320
debian12-x64-1: {ip: 169.60.150.88, swap_file_size_mb: 2048}

‎ansible/playbooks/jenkins/host/create.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
- hosts:
88
- infra-digitalocean-ubuntu2204-x64-1 # ci.nodejs.org
9-
- infra-ibm-ubuntu1804-x64-1 # ci-release.nodejs.org
9+
- infra-ibm-ubuntu2404-x64-1 # ci-release.nodejs.org
1010

1111
roles:
1212
- bootstrap

‎ansible/playbooks/jenkins/host/iptables.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99

1010
- hosts:
1111
- infra-digitalocean-ubuntu2204-x64-1 # ci.nodejs.org
12-
- infra-ibm-ubuntu1804-x64-1 # ci-release.nodejs.org
12+
- infra-ibm-ubuntu2404-x64-1 # ci-release.nodejs.org
1313

1414
vars:
1515
hostgroups: {
1616
'infra-digitalocean-ubuntu2204-x64-1': 'test',
17-
'infra-ibm-ubuntu1804-x64-1': 'release'
17+
'infra-ibm-ubuntu2404-x64-1': 'release'
1818
}
1919

2020
tasks:

0 commit comments

Comments
 (0)