Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ansible: add loongson-clfs-loongarch64-{1,2,3} (#3740) #3741

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ansible: add loongson-clfs-loongarch64-{1,2,3} (#3740) #3741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions ansible/inventory.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,23 @@ hosts:
smartos20-x64-2: {ip: 147.28.162.108}
ubuntu1804_docker-x64-1: {ip: 147.28.162.104, user: ubuntu}

- loongson:
clfs-loongarch64-1:
ansible_python_interpreter: /usr/bin/python3
ip: 111.207.111.194
port: 13966
user: nodejs
clfs-loongarch64-2:
ansible_python_interpreter: /usr/bin/python3
ip: 111.207.111.194
port: 14112
user: nodejs
clfs-loongarch64-3:
ansible_python_interpreter: /usr/bin/python3
ip: 111.207.111.194
port: 14113
user: nodejs

- macstadium:
macos11.0-arm64-1:
ansible_python_interpreter: /usr/bin/python3
Expand Down
8 changes: 4 additions & 4 deletions ansible/plugins/inventory/nodejs_yaml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@

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

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

# providers - validated for consistency
'provider': ('azure', 'digitalocean', 'equinix', 'ibm', 'iinthecloud', 'joyent',
'linuxonecc', 'hetzner', 'macstadium', 'marist', 'mininodes', 'mnx', 'msft',
'orka', 'osuosl', 'rackspace',
'linuxonecc', 'loongson', 'hetzner', 'macstadium', 'marist', 'mininodes', 'mnx',
'msft', 'orka', 'osuosl', 'rackspace',
'rzkh', 'scaleway', 'softlayer', 'voxer')
}
DECRYPT_TOOL = "gpg"
Expand Down
4 changes: 4 additions & 0 deletions ansible/roles/baselayout/vars/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ packages: {
'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',
],

clfs: [
'gcc,g++,binutils,git,curl,autoconf,automake,make,cmake,python3',
],

debian8: [
'ccache,git,gcc-4.9,g++-4.9,libfontconfig1,binutils-2.26,sudo',
],
Expand Down
Empty file added ansible/roles/bootstrap/tasks/partials/clfs.yml
View file
Open in desktop
Empty file.
11 changes: 11 additions & 0 deletions ansible/roles/jenkins-worker/tasks/partials/tap2junit/clfs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---

#
# install tap2junit from pip
#

- name: install tap2junit
ansible.builtin.pip:
executable: /usr/bin/pip3
name: tap2junit=={{ tap2junit_version }}
state: present
3 changes: 2 additions & 1 deletion ansible/roles/jenkins-worker/vars/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ init: {
freebsd: 'freebsd',
ibmi: 'ibmi73',
macos: 'macos',
systemd: ['centos7', 'debian', 'fedora', 'rhel7', 'rhel8', 'rhel9', 'ubuntu1604', 'ubuntu1804','ubuntu2204'],
systemd: ['centos7', 'clfs', 'debian', 'fedora', 'rhel7', 'rhel8', 'rhel9', 'ubuntu1604', 'ubuntu1804','ubuntu2204'],
svc: 'smartos',
zos_start: 'zos'
}
Expand Down Expand Up @@ -61,6 +61,7 @@ jenkins: "{{ jenkins_init[init_type] }}"

# some os'es needs different paths to java. add them here.
java_path: {
'clfs': '/opt/jdk17/bin/java',
'ibmi73': '/QOpenSys/pkgs/lib/jvm/openjdk-11/bin/java',
'macos10.15': 'java',
'macos11': 'java',
Expand Down