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

* unixPB: add new rise paid for scaleway RISC-V hosts * Update ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Providers/tasks/main.yml * Update ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Providers/tasks/main.yml --------- Co-authored-by: Martijn Verburg <[email protected]>
adoptium · May 4, 2024 · a137a33 · a137a33
1 parent 23dd3db
commit a137a33
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/ansible/inventory.yml b/ansible/inventory.yml
@@ -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
 #
@@ -144,14 +144,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}

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Docker/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Docker/tasks/main.yml
@@ -79,7 +79,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
 
@@ -91,7 +90,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
@@ -103,6 +101,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
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Providers/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Providers/tasks/main.yml
@@ -66,9 +66,9 @@
     - providers
     - adoptopenjdk
 
-#####################
-# Marist & Scaleway #
-#####################
+############################
+# Marist & Rise (Scaleway) #
+############################
 
 # Marist & Scaleway machines need their host template updated for changes to /etc/hosts to persist
 - name: Update /etc/cloud/cloud.cfg file - To remove update hosts function
@@ -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
diff --git a/ansible/plugins/inventory/adoptopenjdk_yaml.py b/ansible/plugins/inventory/adoptopenjdk_yaml.py
@@ -49,7 +49,7 @@
   'provider': ('alibaba', 'azure', 'marist', 'osuosl',
         'macstadium', 'macincloud', 'ibmcloud', 'siteox',
         'equinix', 'linaro','digitalocean', 'ibm', 'godaddy',
-        'aws', 'inspira', 'nine', 'scaleway', 'skytap',
+        'aws', 'inspira', 'nine', 'rise', 'skytap',
         'hetzner')
 }