Merge remote-tracking branch 'origin/main' into ci/enable-linting

Author: maxstack

.github/bin/get-s3-image.sh

@@ -17,7 +17,7 @@ if [ -n "$image_exists" ]; then
 else
   echo "Image $image_name not found in OpenStack. Getting it from S3."
 
-  wget "https://object.arcus.openstack.hpc.cam.ac.uk/swift/v1/AUTH_3a06571936a0424bb40bc5c672c4ccb1/$bucket_name/$image_name --progress=dot:giga"
+  wget https://leafcloud.store/swift/v1/AUTH_f39848421b2747148400ad8eeae8d536/$bucket_name/$image_name --progress=dot:giga
 
   echo "Uploading image $image_name to OpenStack..."
   openstack image create --file "$image_name" --disk-format qcow2 "$image_name" --progress

.github/workflows/fatimage.yml

@@ -38,7 +38,7 @@ jobs:
             source_image_name: Rocky-8-GenericCloud-Base-8.10-20240528.0.x86_64.raw
             inventory_groups: control,compute,login,update
           - image_name: openhpc-RL9
-            source_image_name: Rocky-9-GenericCloud-Base-9.5-20241118.0.x86_64.raw
+            source_image_name: Rocky-9-GenericCloud-Base-9.6-20250531.0.x86_64.qcow2
             inventory_groups: control,compute,login,update
     env:
       ANSIBLE_FORCE_COLOR: True

.github/workflows/release-image.yml

@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Write s3cmd configuration
-        run: echo "${{ secrets.ARCUS_S3_CFG }}" > ~/.s3cfg
+        run: echo "${{ secrets.LEAFCLOUD_S3_CFG }}" > ~/.s3cfg
 
       - name: Install s3cmd
         run: |

.github/workflows/s3-image-sync.yml

@@ -1,4 +1,4 @@
-name: Upload CI-tested images to Arcus S3 and sync clouds
+name: Upload CI-tested images to Leafcloud S3 and sync clouds
 on:
   workflow_dispatch:
   push:
@@ -27,7 +27,7 @@ jobs:
 
       - name: Write s3cmd configuration
         run: |
-          echo "${{ secrets['ARCUS_S3_CFG'] }}" > ~/.s3cfg
+          echo "${{ secrets['LEAFCLOUD_S3_CFG'] }}" > ~/.s3cfg
         shell: bash
 
       - name: Install s3cmd
@@ -79,7 +79,7 @@ jobs:
 
       - name: Write s3cmd configuration
         run: |
-          echo "${{ secrets['ARCUS_S3_CFG'] }}" > ~/.s3cfg
+          echo "${{ secrets['LEAFCLOUD_S3_CFG'] }}" > ~/.s3cfg
         shell: bash
 
       - name: Install s3cmd and qemu-utils

.github/workflows/upload-release-image.yml.sample

@@ -19,7 +19,7 @@ on:
     inputs:
       image_name:
         type: string
-        description: Image name from: (https://object.arcus.openstack.hpc.cam.ac.uk/swift/v1/AUTH_3a06571936a0424bb40bc5c672c4ccb1/{BUCKET_NAME})
+        description: Image name from: (https://leafcloud.store/swift/v1/AUTH_f39848421b2747148400ad8eeae8d536/{BUCKET_NAME})
         required: true
       bucket_name:
         type: choice

README.md

@@ -69,7 +69,7 @@ Use the `cookiecutter` template to create a new environment to hold your configu
 
 ```shell
 cd environments
-cookiecutter skeleton
+cookiecutter ../cookiecutter
 ```
 
 and follow the prompts to complete the environment name and description.

ansible/fatimage.yml

@@ -191,6 +191,11 @@
         tasks_from: install.yml
       when: "'alertmanager' in group_names"
 
+    - name: Download HPL source
+      include_role:
+        name: hpctests
+        tasks_from: source-hpl.yml
+
 - hosts: prometheus
   become: true
   gather_facts: true

ansible/portal.yml

@@ -14,10 +14,11 @@
         name: openondemand
         tasks_from: main.yml
 
-- hosts: openondemand_desktop
+- hosts: openondemand_desktop:openondemand_matlab
   tags:
     - openondemand
     - openondemand_desktop
+    - openondemand_matlab
   become: true
   gather_facts: true
   tasks:
@@ -37,3 +38,27 @@
         name: openondemand
         tasks_from: jupyter_compute.yml
       when: appliances_mode != 'configure' # is run during build
+
+- hosts: openondemand_rstudio
+  tags:
+    - openondemand
+    - openondemand_rstudio
+  become: yes
+  gather_facts: yes
+  tasks:
+    - import_role:
+        name: openondemand
+        tasks_from: rstudio_compute.yml
+      when: appliances_mode != 'configure' # is run during build
+
+- hosts: openondemand_codeserver
+  tags:
+    - openondemand
+    - openondemand_codeserver
+  become: yes
+  gather_facts: yes
+  tasks:
+    - import_role:
+        name: openondemand
+        tasks_from: codeserver_compute.yml
+      when: appliances_mode != 'configure' # is run during build

ansible/roles/alertmanager/README.md

@@ -12,13 +12,9 @@ Note that:
 - No Grafana dashboard for alerts is currently provided.
 
 Alertmanager is enabled by default on the `control` node in the
-[everything](../../../environments/common/layouts/everything) template which
-`cookiecutter` uses for a new environment's `inventory/groups` file.
+`site` environment's `inventory/groups` file.
 
 In general usage may only require:
-
-- Adding the `control` node into the `alertmanager` group in `environments/site/groups`
-  if upgrading an existing environment.
 - Enabling the Slack integration (see section below).
 - Possibly setting `alertmanager_web_external_url`.
 

ansible/roles/block_devices/README.md

@@ -11,7 +11,7 @@ This is a convenience wrapper around the ansible modules:
 
 To avoid issues with device names changing after e.g. reboots, devices are identified by serial number and mounted by filesystem UUID.
 
-**NB:** This role is ignored[^1] during Packer builds as block devices will not be attached to the Packer build VMs. This role is therefore deprecated and it is suggested that `cloud-init` is used instead. See e.g. `environments/skeleton/{{cookiecutter.environment}}/tofu/control.userdata.tpl`.
+**NB:** This role is ignored[^1] during Packer builds as block devices will not be attached to the Packer build VMs. This role is therefore deprecated and it is suggested that `cloud-init` is used instead. See e.g. `environments/site/tofu/control.userdata.tpl`.
 
 [^1]: See `environments/common/inventory/group_vars/builder/defaults.yml`