ELevate CI AlmaLinux#3

yuravk · Oct 14, 2024 · 678e1a9 · 678e1a9
1 parent e37bafe
commit 678e1a9
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/.github/workflows/elevate.yml b/.github/workflows/elevate.yml
@@ -89,10 +89,6 @@ jobs:
       run: |
         # Set envirounment variables
 
-        # Source release
-        source_release=$(rpm -E %rhel)
-        echo "source_release=${source_release}" >> $GITHUB_ENV
-
         # Target release
         minor_version=${{ env.version9_minor }}
         [ "${{ matrix.scenario }}" = "8" ] && minor_version=${{ env.version8_minor }}
@@ -157,8 +153,8 @@ jobs:
         if [ $phase -eq 0 ]; then
           dnf -y -q install 'dnf-command(config-manager)'
 
-          source_distro=almalinux-${{ env.source_release }}
-          [ "${{ matrix.scenario }}" = "8" ] && source_distro=centos${{ env.source_release }}
+          source_distro=almalinux-$(rpm -E %rhel)
+          [ "${{ matrix.scenario }}" = "8" ] && source_distro=centos$(rpm -E %rhel)
           case "${{ inputs.repository }}" in
             "stable (ALBS product)")
               echo "[Debug] 'stable (ALBS product)' repository";
@@ -264,6 +260,8 @@ jobs:
     - name: Check source system release
       run: |
         echo "[Debug] $(sudo vagrant ssh elevatevm -c 'cat /etc/redhat-release')"
+        source_release=$(sudo vagrant ssh elevatevm -c 'rpm -E %rhel')
+        echo "source_release=${source_release}" >> $GITHUB_ENV
 
     - name: Install leapp and data
       id: install-leapp-data