Migrate to Alma for test runner

jborean93 · Mar 11, 2024 · 43c7e2c · 43c7e2c
1 parent 076da1d
commit 43c7e2c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 24 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -57,21 +57,26 @@ jobs:
       fail-fast: false
       matrix:
         info:
-        - name: Fedora_37_72_MIT
-          container: fedora:37
+        - name: Linux_37_72_MIT
+          container: almalinux:9
           os: ubuntu-latest
           gssapi_provider: mit
           version: '7.2.0'
-        - name: Fedora_37_73_MIT
-          container: fedora:37
+        - name: Linux_37_73_MIT
+          container: almalinux:9
           os: ubuntu-latest
           gssapi_provider: mit
           version: '7.3.0'
-        - name: Fedora_37_73_Heimdal
-          container: fedora:37
+        - name: Linux_37_74_MIT
+          container: almalinux:9
+          os: ubuntu-latest
+          gssapi_provider: mit
+          version: '7.4.0'
+        - name: Linux_37_74_Heimdal
+          container: almalinux:9
           os: ubuntu-latest
           gssapi_provider: heimdal
-          version: '7.3.0'
+          version: '7.4.0'
 
     steps:
     - uses: actions/checkout@v4

diff --git a/tools/lib.sh b/tools/lib.sh
@@ -20,7 +20,12 @@ lib::setup::system_requirements() {
 }
 
 lib::setup::system_requirements::el() {
-    rpm -Uvh https://packages.microsoft.com/config/rhel/8/packages-microsoft-prod.rpm
+    rpm -Uvh https://packages.microsoft.com/config/rhel/9/packages-microsoft-prod.rpm
+
+    dnf install -y \
+        --nogpgcheck \
+        --disablerepo=\*modul\* \
+        epel-release
 
     if [ x"${GSSAPI_PROVIDER}" = "xheimdal" ]; then
         # heimdal-libs - Provides the Heimdal GSSAPI/Krb5 Library
@@ -33,7 +38,7 @@ lib::setup::system_requirements::el() {
             heimdal-path \
             heimdal-workstation \
             dotnet-sdk-6.0 \
-            wget
+            powershell
 
         source /etc/profile.d/heimdal.sh
 
@@ -53,23 +58,10 @@ lib::setup::system_requirements::el() {
             krb5-libs \
             krb5-workstation \
             dotnet-sdk-6.0 \
-            wget
+            powershell
     fi
 
-    mkdir "/tmp/PowerShell-${PWSH_VERSION}"
-    echo "Downloading PowerShell ${PWSH_VERSION}"
-    wget \
-        --quiet \
-        --output-document "/tmp/powershell.tar.gz" \
-        "https://github.com/PowerShell/PowerShell/releases/download/v${PWSH_VERSION}/powershell-${PWSH_VERSION}-linux-x64.tar.gz"
-
-    echo "Extracting PowerShell ${PWSH_VERSION}"
-    tar xf \
-        "/tmp/powershell.tar.gz" \
-        --directory "/tmp/PowerShell-${PWSH_VERSION}"
-    chmod +x "/tmp/PowerShell-${PWSH_VERSION}/pwsh"
-
-    export PATH="/tmp/PowerShell-${PWSH_VERSION}:~/.dotnet/tools:${PATH}"
+    export PATH="~/.dotnet/tools:${PATH}"
 }
 
 lib::setup::gssapi() {