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

unixPB: add new rise paid for scaleway RISC-V hosts #3530

Merged
merged 6 commits into from
May 4, 2024
Merged

unixPB: add new rise paid for scaleway RISC-V hosts #3530

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
998ce4a
unixPB: add new rise paid for scaleway RISC-V hosts
gdams Apr 23, 2024
ea17ddb
Merge branch 'master' into riscv
gdams Apr 23, 2024
6cd01af
Update ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Providers/t…
karianna Apr 24, 2024
73a1de5
Update ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Providers/t…
karianna Apr 24, 2024
e71e98f
Merge branch 'master' into riscv
karianna Apr 25, 2024
261ef5b
Merge branch 'master' into riscv
gdams May 3, 2024
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
22 changes: 13 additions & 9 deletions ansible/inventory.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---

#
# AdoptOpenJDK hosts! check the readme on how to add more
# Eclipse Adoptium hosts! check the readme on how to add more
# (if its not obvious enough).
# Initial host names are "os-arch-index" within each stanza
#
Expand Down Expand Up @@ -152,14 +152,18 @@ hosts:
ubuntu2004-s390x-1: {ip: 148.100.74.240}
ubuntu2204-s390x-1: {ip: 148.100.74.105}

# Nine machines are behind a firewall. Please contact @sxa or @gdams for access
- nine:
macos1015-x64-1: {ip: 10.0.40.10, ipv6: "2a02:418:3001:40::10", user: administrator}
macos1015-x64-2: {ip: 10.0.40.11, ipv6: "2a02:418:3001:40::11", user: administrator}

- scaleway:
ubuntu2310-riscv64-1: {ip: 62.210.163.13, user: ubuntu}
ubuntu2310-riscv64-2: {ip: 62.210.163.98, user: ubuntu}
# Rise machines are hosted in Scaleway
- rise:
ubuntu2310-riscv64-1: {ip: 62.210.163.38, user: ubuntu}
ubuntu2310-riscv64-2: {ip: 62.210.163.36, user: ubuntu}
ubuntu2310-riscv64-3: {ip: 62.210.163.3, user: ubuntu}
ubuntu2310-riscv64-4: {ip: 62.210.163.137, user: ubuntu}
ubuntu2310-riscv64-5: {ip: 62.210.163.45, user: ubuntu}
ubuntu2310-riscv64-6: {ip: 62.210.163.168, user: ubuntu}
ubuntu2310-riscv64-7: {ip: 62.210.163.105, user: ubuntu}
ubuntu2310-riscv64-8: {ip: 62.210.163.164, user: ubuntu}
ubuntu2310-riscv64-9: {ip: 62.210.163.6, user: ubuntu}
ubuntu2310-riscv64-10: {ip: 62.210.163.102, user: ubuntu}

- siteox:
solaris10u11-sparcv9-1: {ip: cloud.siteox.com, port: 53322}
Expand Down
3 changes: 0 additions & 3 deletions ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Docker/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@
state: present
when:
- (ansible_distribution == "Ubuntu" or ansible_distribution == "Debian") or (ansible_distribution == "SLES") or ((ansible_distribution == "RedHat" or ansible_distribution == "CentOS" ) and ansible_distribution_major_version == "7")
- ansible_architecture != "riscv64"
tags:
- jenkins

Expand All @@ -83,7 +82,6 @@
state: present
when:
- (ansible_distribution == "Ubuntu" or ansible_distribution == "Debian") or (ansible_distribution == "SLES") or ((ansible_distribution == "RedHat" or ansible_distribution == "CentOS" ) and ansible_distribution_major_version == "7")
- ansible_architecture != "riscv64"
- Nagios_Plugins == "Enabled"
tags:
- docker
Expand All @@ -95,6 +93,5 @@
enabled: yes
when:
- (ansible_distribution == "Ubuntu" or ansible_distribution == "Debian") or (ansible_distribution == "SLES") or ((ansible_distribution == "RedHat" or ansible_distribution == "CentOS" ) and ansible_distribution_major_version == "7")
- ansible_architecture != "riscv64"
tags:
- docker
4 changes: 2 additions & 2 deletions ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Providers/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
- adoptopenjdk

#####################
karianna marked this conversation as resolved.
Show resolved Hide resolved
# Marist & Scaleway #
# Marist & Rise (Scaleway) #
#####################
karianna marked this conversation as resolved.
Show resolved Hide resolved

# Marist & Scaleway machines need their host template updated for changes to /etc/hosts to persist
Expand All @@ -78,7 +78,7 @@
state: absent
when:
- provider_name.rc == 0
- (provider_name.stdout == "marist" or provider_name.stdout == "scaleway")
- (provider_name.stdout == "marist" or provider_name.stdout == "rise")
tags:
- providers
- adoptopenjdk
2 changes: 1 addition & 1 deletion ansible/plugins/inventory/adoptopenjdk_yaml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
'provider': ('alibaba', 'azure', 'marist', 'osuosl',
'macstadium', 'macincloud', 'ibmcloud', 'siteox',
'equinix', 'linaro','digitalocean', 'ibm', 'godaddy',
'aws', 'inspira', 'equinix_esxi', 'nine', 'scaleway', 'skytap',
'aws', 'inspira', 'equinix_esxi', 'nine', 'rise', 'skytap',
'hetzner')
}

Expand Down
Loading