inventory: remove scaleway systems (#3114)

Signed-off-by: Stewart X Addison <[email protected]>
adoptium · Jun 24, 2023 · fc7d6fe · fc7d6fe
1 parent df9dffb
commit fc7d6fe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.github/regex_labeler.yml b/.github/regex_labeler.yml
@@ -76,9 +76,9 @@ labels:
   - label: "provider:osuosl"
     matcher:
       title: "osuosl"
-  - label: "provider:scaleway"
+  - label: "provider:skytap"
     matcher:
-      title: "scaleway"
+      title: "skytap"
   - label: "provider:nine"
     matcher:
       title: "nine"

diff --git a/ansible/inventory.yml b/ansible/inventory.yml
@@ -72,6 +72,7 @@ hosts:
           centos74-ppc64le-2: {ip: 140.211.168.117}
           ubuntu2204-aarch64-1: {ip: 140.211.169.57}
 
+
       - siteox:
           solaris10u11-sparcv9-1: {ip: cloud.siteox.com, port: 24322}
 
@@ -175,9 +176,6 @@ hosts:
           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:
-          ubuntu1604-x64-1: {ip: 51.15.76.107}
-
       - siteox:
           solaris10u11-sparcv9-1: {ip: cloud.siteox.com, port: 53322}
 

diff --git a/ansible/plugins/inventory/adoptopenjdk_yaml.py b/ansible/plugins/inventory/adoptopenjdk_yaml.py
@@ -45,7 +45,7 @@
   'type': ('build', 'docker', 'dockerhost', 'infrastructure', 'test', 'jck'),
 
   # providers - validated for consistency
-  'provider': ('alibaba', 'azure', 'marist', 'osuosl', 'scaleway',
+  'provider': ('alibaba', 'azure', 'marist', 'osuosl',
         'macstadium', 'macincloud', 'ibmcloud', 'spearhead', 'siteox',
         'equinix', 'linaro','digitalocean', 'ibm', 'godaddy',
         'aws', 'inspira', 'equinix_esxi', 'nine', 'gdams', 'skytap',