Merge pull request #324 from stackhpc/ci/bump-img

Updates to OpenHPC role and source image

Author: sjpb

ansible/bootstrap.yml

@@ -112,16 +112,6 @@
         tasks_from: config.yml
       tags: config
 
-- name: Setup EESSI
-  hosts: eessi
-  tags: eessi
-  become: true
-  gather_facts: false
-  tasks:
-    - name: Install and configure EESSI
-      import_role:
-        name: eessi
-
 - hosts: update
   gather_facts: false
   become: yes

ansible/extras.yml

@@ -1,4 +1,15 @@
-- hosts: cuda
+- name: Setup EESSI
+  hosts: eessi
+  tags: eessi
+  become: true
+  gather_facts: false
+  tasks:
+    - name: Install and configure EESSI
+      import_role:
+        name: eessi
+
+- name: Setup CUDA
+  hosts: cuda
   become: yes
   gather_facts: no
   tags: cuda

environments/.stackhpc/ARCUS.pkrvars.hcl

@@ -4,7 +4,7 @@ volume_size = 10 # GB
 image_disk_format = "qcow2"
 networks = ["4b6b2722-ee5b-40ec-8e52-a6610e14cc51"] # portal-internal (DNS broken on ilab-60)
 source_image_name = "openhpc-230804-1754-80b8d714" # https://github.com/stackhpc/ansible-slurm-appliance/pull/298
-fatimage_source_image_name = "Rocky-8-GenericCloud-8.6.20220702.0.x86_64.qcow2"
+fatimage_source_image_name = "Rocky-8-GenericCloud-Base-8.8-20230518.0.x86_64.qcow2"
 ssh_keypair_name = "slurm-app-ci"
 ssh_private_key_file = "~/.ssh/id_rsa"
 security_groups = ["default", "SSH"]

environments/.stackhpc/SMS.pkrvars.hcl

@@ -1,7 +1,7 @@
 flavor = "general.v1.tiny"
 networks = ["26023e3d-bc8e-459c-8def-dbd47ab01756"] # stackhpc-ipv4-geneve
 source_image_name = "openhpc-230503-0944-bf8c3f63" # https://github.com/stackhpc/ansible-slurm-appliance/pull/252
-fatimage_source_image_name = "Rocky-8-GenericCloud-8.6.20220702.0.x86_64.qcow2"
+fatimage_source_image_name = "Rocky-8-GenericCloud-Base-8.8-20230518.0.x86_64.qcow2"
 ssh_keypair_name = "slurm-app-ci"
 ssh_private_key_file = "~/.ssh/id_rsa"
 security_groups = ["default", "SSH"]

environments/.stackhpc/hooks/post-bootstrap.yml

@@ -0,0 +1,16 @@
+- hosts: podman:!builder
+  become: yes
+  gather_facts: false
+  tags: podman
+  tasks:
+    - name: Configure container image registry for unqualified searches to avoid docker.io ratelimits
+      copy:
+        dest: /etc/containers/registries.conf.d/003-arcus-unqualfied-overrides.conf
+        content: |
+          unqualified-search-registries = ['{{ podman_registry_address  | split('/') | first }}', 'registry.access.redhat.com', 'registry.redhat.io', 'docker.io']
+
+          [[registry]]
+          prefix = "{{ podman_registry_address }}"
+          location = "{{ podman_registry_address }}"
+          insecure = true
+      when: "ci_cloud == 'ARCUS'"

environments/.stackhpc/hooks/post.yml

@@ -15,20 +15,3 @@
         - "{{ lookup('env', 'APPLIANCES_ENVIRONMENT_ROOT') }}/inventory/hosts"
         - "{{ lookup('env', 'APPLIANCES_ENVIRONMENT_ROOT') }}/inventory/group_vars/all/secrets.yml"
         - "{{ lookup('env', 'APPLIANCES_ENVIRONMENT_ROOT') }}/inventory/group_vars/all/test_user.yml"
-
-- hosts: all:!builder
-  become: yes
-  gather_facts: false
-  tags: podman
-  tasks:
-    - name: Configure container image registry for unqualified searches to avoid docker.io ratelimits
-      copy:
-        dest: /etc/containers/registries.conf.d/003-arcus-unqualfied-overrides.conf
-        content: |
-          unqualified-search-registries = ['{{ podman_registry_address  | split('/') | first }}', 'registry.access.redhat.com', 'registry.redhat.io', 'docker.io']
-
-          [[registry]]
-          prefix = "{{ podman_registry_address }}"
-          location = "{{ podman_registry_address }}"
-          insecure = true
-      when: "ci_cloud == 'ARCUS'"

environments/.stackhpc/hooks/pre.yml

@@ -13,9 +13,8 @@ variable "cluster_name" {
 variable "cluster_image" {
     description = "single image for all cluster nodes - a convenience for CI"
     type = string
-    default = "openhpc-231020-1357-b5d8b056" # https://github.com/stackhpc/ansible-slurm-appliance/pull/320
-    # default = "Rocky-8-GenericCloud-Base-8.7-20221130.0.x86_64.qcow2"
-    # default = "Rocky-8-GenericCloud-8.6.20220702.0.x86_64.qcow2"
+    default = "openhpc-231027-0916-893570de" # https://github.com/stackhpc/ansible-slurm-appliance/pull/324
+    # default = "Rocky-8-GenericCloud-Base-8.8-20230518.0.x86_64.qcow2"
 }
 
 variable "cluster_net" {}

environments/.stackhpc/terraform/main.tf

@@ -3,7 +3,7 @@ roles:
   - src: stackhpc.nfs
     version: v22.9.1
   - src: https://github.com/stackhpc/ansible-role-openhpc.git
-    version: v0.20.0 # Allow multiple empty partitions by @sjpb in #156
+    version: v0.23.0 # https://github.com/stackhpc/ansible-role-openhpc/pull/165
     name: stackhpc.openhpc
   - src: https://github.com/stackhpc/ansible-node-exporter.git
     version: feature/no-install