ELevate CI AlmaLinux#3

yuravk · Oct 18, 2024 · 91e2872 · 91e2872
1 parent db3a630
commit 91e2872
Showing 1 changed file with 37 additions and 29 deletions.
diff --git a/.github/workflows/elevate.yml b/.github/workflows/elevate.yml
@@ -135,7 +135,7 @@ jobs:
             target_release_string="Rocky Linux release ${target_release}"
             ;;
         esac
-        [ "${{ matrix.scenario }}" = "8" ] && vm_box='centos/7' # 'eurolinux-vagrant/centos-7' # 'generic/centos7'
+        [ "${{ matrix.scenario }}" = "8" ] && vm_box='centos/7' # 'eurolinux-vagrant/centos-7' 'generic/centos7'
 
         echo "target_release_string=${target_release_string}" >> $GITHUB_ENV
         echo "source_release=${source_release}" >> $GITHUB_ENV
@@ -274,39 +274,47 @@ jobs:
           sudo cp -av /etc/leapp/files/vendors.d/imunify.repo /etc/yum.repos.d/
           sudo sed -i "s/\/${{ matrix.scenario }}\//\/${source_release}\//g" /etc/yum.repos.d/imunify.repo
           sudo sed -i 's/cloudlinux${{ matrix.scenario }}-//g' /etc/yum.repos.d/imunify.repo
+
           sudo dnf -y install \
-          imunify360-php-i360 \
-          imunify360-venv \
-          imunify360-php-daemon \
-          cloudlinux-linksafe \
-          alt-sqlite \
-          alt-python311-setuptools-wheel \
-          alt-python311-pip-wheel \
-          alt-python311-libs \
-          alt-python311 \
-          alt-openssl11-libs \
-          alt-hyperscanpd
+            imunify360-php-i360 \
+            imunify360-venv \
+            imunify360-php-daemon \
+            cloudlinux-linksafe \
+            alt-sqlite \
+            alt-python311-setuptools-wheel \
+            alt-python311-pip-wheel \
+            alt-python311-libs \
+            alt-python311 \
+            alt-openssl11-libs \
+            alt-hyperscanpd
           res=$?
         fi
 
         if [ "${vendor}" = "nginx" ]; then
-          cat << 'NGINX'> /etc/yum.repos.d/nginx.repo
-        [nginx-stable]
-        name=nginx stable repo
-        baseurl=http://nginx.org/packages/centos/$releasever/$basearch/
-        gpgcheck=1
-        enabled=1
-        gpgkey=https://nginx.org/keys/nginx_signing.key
-        module_hotfixes=true
-
-        [nginx-mainline]
-        name=nginx mainline repo
-        baseurl=http://nginx.org/packages/mainline/centos/$releasever/$basearch/
-        gpgcheck=1
-        enabled=0
-        gpgkey=https://nginx.org/keys/nginx_signing.key
-        module_hotfixes=true
-        NGINX
+          # TODO prepare/install the repository config instead of changing vendor's one
+          for nginx_release in stable mainline; do
+            sudo cp -av /etc/leapp/files/vendors.d/nginx-${nginx_release}.repo /etc/yum.repos.d/
+            sudo sed -i "s/\/${{ matrix.scenario }}\//\/${source_release}\//g" /etc/yum.repos.d/nginx-${nginx_release}.repo
+            sudo sed -i 's/el${{ matrix.scenario }}-//g' /etc/yum.repos.d/nginx-${nginx_release}.repo
+          done
+
+        #   cat << 'NGINX'> /etc/yum.repos.d/nginx.repo
+        # [nginx-stable]
+        # name=nginx stable repo
+        # baseurl=http://nginx.org/packages/centos/$releasever/$basearch/
+        # gpgcheck=1
+        # enabled=1
+        # gpgkey=https://nginx.org/keys/nginx_signing.key
+        # module_hotfixes=true
+
+        # [nginx-mainline]
+        # name=nginx mainline repo
+        # baseurl=http://nginx.org/packages/mainline/centos/$releasever/$basearch/
+        # gpgcheck=1
+        # enabled=0
+        # gpgkey=https://nginx.org/keys/nginx_signing.key
+        # module_hotfixes=true
+        # NGINX
           sudo dnf -y install nginx
           res=$?
         fi