Merge branch 'main' into fix/lustre-extrabuild

wtripp180901 · wtripp180901 · commit b2c1ff37d15b · 2025-01-03T09:17:41.000Z
diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml
@@ -23,10 +23,10 @@ jobs:
       matrix: # build RL8, RL9
         build:
           - image_name: openhpc-RL8
-            source_image_name: Rocky-8-GenericCloud-Base-8.9-20231119.0.x86_64.qcow2
+            source_image_name: Rocky-8-GenericCloud-Base-8.10-20240528.0.x86_64.qcow2
             inventory_groups: control,compute,login,update
           - image_name: openhpc-RL9
-            source_image_name: Rocky-9-GenericCloud-Base-9.4-20240523.0.x86_64.qcow2
+            source_image_name: Rocky-9-GenericCloud-Base-9.5-20241118.0.x86_64.qcow2
             inventory_groups: control,compute,login,update
     env:
       ANSIBLE_FORCE_COLOR: True
diff --git a/.github/workflows/nightlybuild.yml b/.github/workflows/nightlybuild.yml
@@ -25,7 +25,7 @@ jobs:
       matrix: # build RL8, RL9
         build:
           - image_name: rocky-latest-RL8
-            source_image_name: Rocky-8-GenericCloud-Base-8.9-20231119.0.x86_64.qcow2
+            source_image_name: Rocky-8-GenericCloud-Base-8.10-20240528.0.x86_64.qcow2
             inventory_groups: update
           - image_name: rocky-latest-RL9
             source_image_name: Rocky-9-GenericCloud-Base-9.4-20240523.0.x86_64.qcow2
diff --git a/.github/workflows/trivyscan.yml b/.github/workflows/trivyscan.yml
@@ -25,6 +25,20 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Override CI_CLOUD if PR label is present
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          # Iterate over the labels
+          labels=$(echo '${{ toJSON(github.event.pull_request.labels) }}' | jq -r '.[].name')
+          echo $labels
+          for label in $labels; do
+             if [[ $label == CI_CLOUD=* ]]; then
+              # Extract the value after 'CI_CLOUD='
+              CI_CLOUD_OVERRIDE=${label#CI_CLOUD=}
+              echo "CI_CLOUD=${CI_CLOUD_OVERRIDE}" >> $GITHUB_ENV
+            fi
+          done
+
       - name: Record settings for CI cloud
         run: |
           echo CI_CLOUD: ${{ env.CI_CLOUD }}
diff --git a/ansible/adhoc/sync-pulp.yml b/ansible/adhoc/sync-pulp.yml
@@ -6,5 +6,5 @@
       vars:
         pulp_site_target_arch: "x86_64"
         pulp_site_target_distribution: "rocky"
-        pulp_site_target_distribution_version: "9.4"
+        pulp_site_target_distribution_version: "9.5"
         pulp_site_target_distribution_version_major: "9"
diff --git a/ansible/bootstrap.yml b/ansible/bootstrap.yml
@@ -122,7 +122,6 @@
     ansible.builtin.include_role:
       name: dnf_repos
       tasks_from: set_repos.yml
-    when: ansible_distribution_major_version == "9" #TODO update role once RL8 config decided
 
 # --- tasks after here require access to package repos ---
 - hosts: squid
diff --git a/ansible/disable-repos.yml b/ansible/disable-repos.yml
@@ -5,4 +5,3 @@
       ansible.builtin.include_role:
         name: dnf_repos
         tasks_from: disable_repos.yml
-      when: ansible_distribution_major_version == "9" #TODO update role once RL8 config decided
diff --git a/ansible/roles/dnf_repos/defaults/main.yml b/ansible/roles/dnf_repos/defaults/main.yml
@@ -2,18 +2,32 @@ dnf_repos_pulp_content_url: "{{ appliances_pulp_url }}/pulp/content"
 dnf_repos_username: "{{ omit }}"
 dnf_repos_password: "{{ omit }}"
 
+dnf_repos_filenames:
+  '8':
+    baseos: 'Rocky-BaseOS'
+    appstream: 'Rocky-AppStream'
+    crb: 'Rocky-PowerTools'
+    extras: 'Rocky-Extras'
+  '9':
+    baseos: 'rocky'
+    appstream: 'rocky'
+    crb: 'rocky'
+    extras: 'rocky-extras'
+
+dnf_repos_version_filenames: "{{ dnf_repos_filenames[ansible_distribution_major_version] }}"
+
 # epel installed separately
 dnf_repos_repolist:
-- file: rocky
+- file: "{{ dnf_repos_version_filenames.baseos }}"
   name: baseos
   base_url: "{{ dnf_repos_pulp_content_url }}/{{ appliances_pulp_repos.baseos[ansible_distribution_version] | appliances_repo_to_subpath }}"
-- file: rocky
+- file: "{{ dnf_repos_version_filenames.appstream }}"
   name: appstream
   base_url: "{{ dnf_repos_pulp_content_url }}/{{ appliances_pulp_repos.appstream[ansible_distribution_version] | appliances_repo_to_subpath }}"
-- file: rocky
-  name: crb
+- file: "{{ dnf_repos_version_filenames.crb }}"
+  name: "{{ 'powertools' if ansible_distribution_major_version == '8' else 'crb' }}"
   base_url: "{{ dnf_repos_pulp_content_url }}/{{ appliances_pulp_repos.crb[ansible_distribution_version] | appliances_repo_to_subpath }}"
-- file: rocky-extras
+- file: "{{ dnf_repos_version_filenames.extras }}"
   name: extras
   base_url: "{{ dnf_repos_pulp_content_url }}/{{ appliances_pulp_repos.extras[ansible_distribution_version] | appliances_repo_to_subpath }}"
 
diff --git a/ansible/roles/dnf_repos/tasks/set_repos.yml b/ansible/roles/dnf_repos/tasks/set_repos.yml
@@ -8,6 +8,7 @@
     description: "{{ item.name }}"
     username: "{{ dnf_repos_username }}"
     password: "{{ dnf_repos_password }}"
+    gpgcheck: false
   loop: "{{ dnf_repos_repolist }}"
 
 - name: Install epel-release
diff --git a/ansible/roles/podman/tasks/config.yml b/ansible/roles/podman/tasks/config.yml
@@ -55,6 +55,7 @@
       # Type Path Mode User Group Age Argument
       R! /tmp/containers-user-*
       R! /tmp/podman-run-*
+      R! /tmp/storage-run-*
     dest: /etc/tmpfiles.d/podman-local.conf
     owner: root
     group: root
diff --git a/docs/experimental/pulp.md b/docs/experimental/pulp.md
@@ -14,4 +14,4 @@ An existing Pulp server can be used to host Ark repos by overriding `pulp_site_p
 
 ## Syncing Pulp content with Ark
 
-If the `pulp` group is added to the Packer build groups, the local Pulp server will be synced with Ark on build. You must authenticate with Ark by overriding `pulp_site_upstream_username` and `pulp_site_upstream_password` with your vault encrypted Ark dev credentials. `dnf_repos_username` and `dnf_repos_password` must remain unset to access content from the local Pulp. Content can also be synced by running `ansible/adhoc/sync-pulp.yml`. By default this syncs repositories for Rocky 9.4 with x86_64 architecture, but can be overriden by setting extravars for `pulp_site_target_arch`, `pulp_site_target_distribution`, `pulp_site_target_distribution_version` and `pulp_site_target_distribution_version_major`.
+If the `pulp` group is added to the Packer build groups, the local Pulp server will be synced with Ark on build. You must authenticate with Ark by overriding `pulp_site_upstream_username` and `pulp_site_upstream_password` with your vault encrypted Ark dev credentials. `dnf_repos_username` and `dnf_repos_password` must remain unset to access content from the local Pulp. Content can also be synced by running `ansible/adhoc/sync-pulp.yml`. By default this syncs repositories for Rocky 9.5 with x86_64 architecture, but can be overriden by setting extravars for `pulp_site_target_arch`, `pulp_site_target_distribution`, `pulp_site_target_distribution_version` and `pulp_site_target_distribution_version_major`.
diff --git a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json
@@ -1,6 +1,6 @@
 {
     "cluster_image": {
-        "RL8": "openhpc-RL8-241220-1131-a2dde143",
-        "RL9": "openhpc-RL9-241220-1131-a2dde143"
+        "RL8": "openhpc-RL8-250102-1138-77cfc703",
+        "RL9": "openhpc-RL9-250102-1139-77cfc703"
     }
 }
diff --git a/environments/common/inventory/group_vars/all/defaults.yml b/environments/common/inventory/group_vars/all/defaults.yml
@@ -108,19 +108,46 @@ appliances_pulp_repos:
     '9.4':
       timestamp: 20241115T011711
       path: rocky/9.4/BaseOS/x86_64/os
+    '9.5':
+      timestamp: 20241216T013503
+      path: rocky/9.5/BaseOS/x86_64/os
+    '8.10':
+      timestamp: 20241217T123729
+      path: rocky/8.10/BaseOS/x86_64/os
   appstream:
     '9.4':
       timestamp: 20241112T003151
       path: rocky/9.4/AppStream/x86_64/os
+    '9.5':
+      timestamp: 20241217T005008
+      path: rocky/9.5/AppStream/x86_64/os
+    '8.10':
+      timestamp: 20241217T123729
+      path: rocky/8.10/AppStream/x86_64/os
   crb:
     '9.4':
       timestamp: 20241115T003133
       path: rocky/9.4/CRB/x86_64/os
+    '9.5':
+      timestamp: 20241217T005008
+      path: rocky/9.5/CRB/x86_64/os
+    '8.10':
+      timestamp: 20241217T123729
+      path: rocky/8.10/PowerTools/x86_64/os
   extras:
     '9.4':
       timestamp: 20241118T002802
       path: rocky/9.4/extras/x86_64/os
+    '9.5':
+      timestamp: 20241218T004632
+      path: rocky/9.5/extras/x86_64/os
+    '8.10':
+      timestamp: 20241217T123729
+      path: rocky/8.10/extras/x86_64/os
   epel:
     '9':
       timestamp: 20241213T010218
-      path: epel/9/Everything/x86_64
+      path: epel/9/Everything/x86_64
+    '8':
+      timestamp: 20241216T235733
+      path: epel/8/Everything/x86_64
diff --git a/environments/common/inventory/group_vars/all/openhpc.yml b/environments/common/inventory/group_vars/all/openhpc.yml
@@ -41,10 +41,4 @@ openhpc_state_save_location: "{{ appliances_state_dir + '/slurmctld' if applianc
 
 ohpc_default_extra_repos:
   "9": [] #overriding to ensure doesn't overwrite ark epel repo
-  "8":
-    - name: epel
-      file: epel
-      description: "Extra Packages for Enterprise Linux 8 - $basearch"
-      metalink: "https://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch&infra=$infra&content=$contentdir"
-      gpgcheck: true
-      gpgkey: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8"
+  "8": []
diff --git a/requirements.yml b/requirements.yml
@@ -25,7 +25,7 @@ roles:
 
 collections:
   - name: containers.podman
-    version: 1.10.2
+    version: 1.16.2
   - name: community.grafana
     version: 1.5.4
   - name: https://github.com/stackhpc/ansible_collection_slurm_openstack_tools

Original file line number	Diff line number	Diff line change
@@ -14,4 +14,4 @@ An existing Pulp server can be used to host Ark repos by overriding `pulp_site_p
`14`	`14`
`15`	`15`	`## Syncing Pulp content with Ark`
`16`	`16`
`17`		-If the `pulp` group is added to the Packer build groups, the local Pulp server will be synced with Ark on build. You must authenticate with Ark by overriding `pulp_site_upstream_username` and `pulp_site_upstream_password` with your vault encrypted Ark dev credentials. `dnf_repos_username` and `dnf_repos_password` must remain unset to access content from the local Pulp. Content can also be synced by running `ansible/adhoc/sync-pulp.yml`. By default this syncs repositories for Rocky 9.4 with x86_64 architecture, but can be overriden by setting extravars for `pulp_site_target_arch`, `pulp_site_target_distribution`, `pulp_site_target_distribution_version` and `pulp_site_target_distribution_version_major`.
	`17`	+If the `pulp` group is added to the Packer build groups, the local Pulp server will be synced with Ark on build. You must authenticate with Ark by overriding `pulp_site_upstream_username` and `pulp_site_upstream_password` with your vault encrypted Ark dev credentials. `dnf_repos_username` and `dnf_repos_password` must remain unset to access content from the local Pulp. Content can also be synced by running `ansible/adhoc/sync-pulp.yml`. By default this syncs repositories for Rocky 9.5 with x86_64 architecture, but can be overriden by setting extravars for `pulp_site_target_arch`, `pulp_site_target_distribution`, `pulp_site_target_distribution_version` and `pulp_site_target_distribution_version_major`.