Skip to content

Commit fcc1ee2

Browse files
author
Shi Pujin
committed
ansible: add loongson-clfs-loongarch64-{1,2,3} (nodejs#3740)
Refs: nodejs#3740
1 parent f9ce3da commit fcc1ee2

File tree

6 files changed

+38
-5
lines changed

6 files changed

+38
-5
lines changed

ansible/inventory.yml

+17
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,23 @@ hosts:
5656
smartos20-x64-2: {ip: 147.28.162.108}
5757
ubuntu1804_docker-x64-1: {ip: 147.28.162.104, user: ubuntu}
5858

59+
- loongson:
60+
clfs-loongarch64-1:
61+
ansible_python_interpreter: /usr/bin/python3
62+
ip: 111.207.111.194
63+
port: 13966
64+
user: nodejs
65+
clfs-loongarch64-2:
66+
ansible_python_interpreter: /usr/bin/python3
67+
ip: 114.242.206.194
68+
port: 14122
69+
user: nodejs
70+
clfs-loongarch64-3:
71+
ansible_python_interpreter: /usr/bin/python3
72+
ip: 114.242.206.194
73+
port: 14123
74+
user: nodejs
75+
5976
- macstadium:
6077
macos11.0-arm64-1:
6178
ansible_python_interpreter: /usr/bin/python3

ansible/plugins/inventory/nodejs_yaml.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@
3939

4040
valid = {
4141
# taken from nodejs/node.git: ./configure
42-
'arch': ('armv6l', 'armv7l', 'arm64', 'ia32', 'mips', 'mipsel', 'ppc',
43-
'ppc64', 'x32', 'x64', 'x86', 's390', 's390x'),
42+
'arch': ('armv6l', 'armv7l', 'arm64', 'ia32', 'loong64', 'mips', 'mipsel',
43+
'ppc', 'ppc64', 'x32', 'x64', 'x86', 's390', 's390x'),
4444

4545
# valid roles - add as necessary
4646
'type': ('infra', 'release', 'test'),
4747

4848
# providers - validated for consistency
4949
'provider': ('azure', 'digitalocean', 'equinix', 'ibm', 'iinthecloud', 'joyent',
50-
'linuxonecc', 'hetzner', 'macstadium', 'marist', 'mininodes', 'msft',
51-
'orka', 'osuosl', 'rackspace',
50+
'linuxonecc', 'loongson', 'hetzner', 'macstadium', 'marist', 'mininodes',
51+
'msft', 'orka', 'osuosl', 'rackspace',
5252
'rzkh', 'scaleway', 'softlayer', 'voxer')
5353
}
5454
DECRYPT_TOOL = "gpg"

ansible/roles/baselayout/vars/main.yml

+4
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ packages: {
5959
'autoconf,automake,ca-certificates-mozilla,tar-gnu,gzip,ccache,cmake,coreutils-gnu,gcc10,gcc10-cplusplus,gcc10-cpp,git,libstdcplusplus6-10-devel,m4-gnu,openssl-devel,python2-setuptools,python3,python3-pip,python39,python39-pip,python39-setuptools,sed-gnu,zlib-devel,icu-devel,c-ares-devel,brotli-devel,grep-gnu,pkg-config,xz',
6060
],
6161

62+
clfs: [
63+
'gcc,g++,binutils,git,curl,autoconf,automake,make,cmake,python3',
64+
],
65+
6266
debian8: [
6367
'ccache,git,gcc-4.9,g++-4.9,libfontconfig1,binutils-2.26,sudo',
6468
],

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

Whitespace-only changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
3+
#
4+
# install tap2junit from pip
5+
#
6+
7+
- name: install tap2junit
8+
ansible.builtin.pip:
9+
executable: /usr/bin/pip3
10+
name: tap2junit=={{ tap2junit_version }}
11+
state: present

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ init: {
99
freebsd: 'freebsd',
1010
ibmi: 'ibmi73',
1111
macos: 'macos',
12-
systemd: ['centos7', 'debian', 'fedora', 'rhel7', 'rhel8', 'rhel9', 'ubuntu1604', 'ubuntu1804','ubuntu2204'],
12+
systemd: ['centos7', 'clfs', 'debian', 'fedora', 'rhel7', 'rhel8', 'rhel9', 'ubuntu1604', 'ubuntu1804','ubuntu2204'],
1313
svc: 'smartos',
1414
zos_start: 'zos'
1515
}
@@ -61,6 +61,7 @@ jenkins: "{{ jenkins_init[init_type] }}"
6161

6262
# some os'es needs different paths to java. add them here.
6363
java_path: {
64+
'clfs': '/opt/jdk17/bin/java',
6465
'ibmi73': '/QOpenSys/pkgs/lib/jvm/openjdk-11/bin/java',
6566
'macos10.15': 'java',
6667
'macos11': 'java',

0 commit comments

Comments
 (0)