Merge pull request #125 from stackhpc/feature/Rocky

Support Rocky Linux
stackhpc · Jan 18, 2022 · 42db2fa · 42db2fa
2 parents 6b2148e + 5303f2e
commit 42db2fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,10 +24,8 @@ jobs:
       fail-fast: false
       matrix:
         image:
-          - 'centos:8.2.2004'
-          - 'centos:8.3.2011'
-          - 'centos:8.4.2105'
           - 'centos:7'
+          - 'rockylinux:8.5'
         scenario:
           - test1
           - test1b

diff --git a/tasks/install.yml b/tasks/install.yml
@@ -19,14 +19,14 @@
   include_vars:
     file: "ohpc-{{ ansible_facts.packages['ohpc-release'][0]['version'] }}"
 
-- name: Find CentOS8 PowerTools repo
+- name: Find PowerTools repo
   find:
     paths: /etc/yum.repos.d
-    patterns: CentOS-*PowerTools.repo
+    patterns: '*-*PowerTools.repo'
   register: powertools
   when: ansible_distribution_major_version == "8"
 
-- name: Enable CentOS8 PowerTools repo
+- name: Enable PowerTools repo
   # NB: doesn't run command  `dnf config-manager --set-enabled PowerTools` as can't make that idempotent
   lineinfile:
     path: "{{ powertools.files[0].path }}" # 8.2: /etc/yum.repos.d/CentOS-PowerTools.repo 8.3: /etc/yum.repos.d/CentOS-Linux-PowerTools.repo