Merge pull request AlmaLinux#121 from yuravk/devel-ng-0.21.0

Sync data with upstream most recent changes. Update CI.
yuravk · Nov 28, 2024 · adf8342 · adf8342
2 parents 65b680c + 26619d5
commit adf8342
Show file tree

Hide file tree

Showing 20 changed files with 113,168 additions and 12,538 deletions.
diff --git a/.github/workflows/elevate.yml b/.github/workflows/elevate.yml
@@ -1,4 +1,4 @@
-name: AlmaLinux ELevete
+name: AlmaLinux ELevate
 
 on:
   workflow_dispatch:
@@ -92,8 +92,6 @@ jobs:
             scenario: '9'
 
     env:
-      version8_minor: 10
-      version9_minor: 4
       vm_serial_log: '/var/log/elevatevm_consoles/serial.log'
       vm_boot_timeout: 600
 
@@ -111,47 +109,43 @@ jobs:
           8)
             variant=el7toel8
             source_release=7
-            minor_version=${{ env.version8_minor }}
             source_distro=centos
             [ "${{ matrix.distro }}" = "scientific" ] && source_distro=scientific
             ;;
           9)
             variant=el8toel9
             source_release=8
-            minor_version=${{ env.version9_minor }}
             source_distro=${{ matrix.distro }}
             ;;
         esac
         target_distro=${{ matrix.distro }}
-        target_release="${{ matrix.scenario }}.${minor_version}"
 
         # Target system release file, string and Vagrant image
         target_release_file=/etc/${{ matrix.distro }}-release
         case ${{ matrix.distro }} in
           almalinux|scientific )
             vm_box=almalinux/${source_release}
             target_distro=almalinux
-            target_release_string="AlmaLinux release ${target_release}"
+            target_release_string="AlmaLinux release ${{ matrix.scenario }}"
             target_release_file=/etc/almalinux-release
             ;;
           centos )
             vm_box=eurolinux-vagrant/centos-stream-${source_release} # generic/centos8s
             target_release_string="CentOS Stream release ${{ matrix.scenario }}"
-            target_release=${{ matrix.scenario }}
             ;;
           eurolinux )
             vm_box=eurolinux-vagrant/eurolinux-${source_release}
-            target_release_string="EuroLinux release ${target_release}"
+            target_release_string="EuroLinux release ${{ matrix.scenario }}"
             target_release_file=/etc/el-release
             ;;
           oraclelinux )
             vm_box=eurolinux-vagrant/oracle-linux-${source_release} # generic/oracle8
-            target_release_string="Oracle Linux Server release ${target_release}"
+            target_release_string="Oracle Linux Server release ${{ matrix.scenario }}"
             target_release_file=/etc/oracle-release
             ;;
           rocky )
             vm_box=eurolinux-vagrant/rocky-${source_release} # generic/rocky8
-            target_release_string="Rocky Linux release ${target_release}"
+            target_release_string="Rocky Linux release ${{ matrix.scenario }}"
             ;;
         esac
         if [ "${source_release}" = "7" ]; then
@@ -164,7 +158,6 @@ jobs:
         echo "target_release_string=${target_release_string}" >> $GITHUB_ENV
         echo "target_release_file=${target_release_file}" >> $GITHUB_ENV
         echo "source_release=${source_release}" >> $GITHUB_ENV
-        echo "target_release=${target_release}" >> $GITHUB_ENV
         echo "source_distro=${source_distro}" >> $GITHUB_ENV
         echo "target_distro=${target_distro}" >> $GITHUB_ENV
         echo "variant_long=${source_distro}${source_release}-to-${target_distro}${{ matrix.scenario }}" >> $GITHUB_ENV
@@ -283,17 +276,17 @@ jobs:
         EOF
         chmod +x ELevate.sh
 
-    - name: Create Verndors.sh
+    - name: Create Vendors.sh
       run: |
         # The script install Vendors
-        cat << 'EOF'> Verndors.sh
+        cat << 'EOF'> Vendors.sh
         #!/bin/bash
         export LANG=en_US.UTF-8
         export LANGUAGE=en_US.UTF-8
         export LC_COLLATE=C
         export LC_CTYPE=en_US.UTF-8
 
-        # Verdor name to install, one of: 'epel', 'kernelcare', 'imunify', ...
+        # Vendor name to install, one of: 'epel', 'kernelcare', 'imunify', ...
         vendor=$1
         # Source system release number: '7', '8', ...
         source_release=$2
@@ -355,7 +348,7 @@ jobs:
 
         if [ "${vendor}" = "mariadb" ]; then
           # MariaDB server requires some packages from EPEL on EL7
-          if [ "${source_release}" = "7" ]; then 
+          if [ "${source_release}" = "7" ]; then
            sudo dnf -y -q install epel-release
           fi
 
@@ -410,7 +403,7 @@ jobs:
 
         exit ${res}
         EOF
-        chmod +x Verndors.sh
+        chmod +x Vendors.sh
 
     - name: Create leapp-data-rpm.sh
       run: |
@@ -435,7 +428,7 @@ jobs:
         /bin/cp -a /vagrant/* ${rpmbuild_topdir}/SOURCES/${name}-${version}/
         /bin/cp /vagrant/leapp-data.spec ${rpmbuild_topdir}/SPECS/
         # Exclude some files generated by the workflow
-        rm -f ${rpmbuild_topdir}/SOURCES/${name}-${version}/{ELevate.sh,Verndors.sh,leapp-data-rpm.sh}
+        rm -f ${rpmbuild_topdir}/SOURCES/${name}-${version}/{ELevate.sh,Vendors.sh,leapp-data-rpm.sh}
         cd ${rpmbuild_topdir}/SOURCES/ && tar zcf ${source} ${name}-${version}
 
         # Build and install the package
@@ -512,42 +505,42 @@ jobs:
     - name: Vendor - EPEL
       if: inputs.vendors == 'all' && env.target_distro == 'almalinux'
       run: |
-        sudo vagrant ssh elevatevm -c "sudo /vagrant/Verndors.sh epel ${{ env.source_release }}" || exit 1
+        sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh epel ${{ env.source_release }}" || exit 1
 
     - name: Vendor - KernelCare
       if: inputs.vendors == 'all'
       run: |
-        sudo vagrant ssh elevatevm -c "sudo /vagrant/Verndors.sh kernelcare ${{ env.source_release }}" || exit 1
+        sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh kernelcare ${{ env.source_release }}" || exit 1
 
     - name: Vendor - Nginx
       if: inputs.vendors == 'all'
       run: |
-        sudo vagrant ssh elevatevm -c "sudo /vagrant/Verndors.sh nginx ${{ env.source_release }}" || exit 1
+        sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh nginx ${{ env.source_release }}" || exit 1
 
     - name: Vendor - MariaDB
       if: inputs.vendors == 'all'
       run: |
-        sudo vagrant ssh elevatevm -c "sudo /vagrant/Verndors.sh mariadb ${{ env.source_release }}" || exit 1
+        sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh mariadb ${{ env.source_release }}" || exit 1
 
     - name: Vendor - PostgreSQL
       if: inputs.vendors == 'all'
       run: |
-        sudo vagrant ssh elevatevm -c "sudo /vagrant/Verndors.sh postgresql ${{ env.source_release }}" || exit 1
+        sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh postgresql ${{ env.source_release }}" || exit 1
 
     - name: Vendor - Docker-CE
       if: inputs.vendors == 'all'
       run: |
-        sudo vagrant ssh elevatevm -c "sudo /vagrant/Verndors.sh docker ${{ env.source_release }}" || exit 1
+        sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh docker ${{ env.source_release }}" || exit 1
 
     - name: Vendor - Microsoft
       if: inputs.vendors == 'all'
       run: |
-        sudo vagrant ssh elevatevm -c "sudo /vagrant/Verndors.sh microsoft ${{ env.source_release }}" || exit 1
+        sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh microsoft ${{ env.source_release }}" || exit 1
 
     - name: Vendor - Imunify360
       if: inputs.vendors == 'all' && matrix.scenario == '8'
       run: |
-        sudo vagrant ssh elevatevm -c "sudo /vagrant/Verndors.sh imunify ${{ env.source_release }}" || exit 1
+        sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh imunify ${{ env.source_release }}" || exit 1
 
     - name: leapp preupgrade
       id: leapp-preupgrade
@@ -592,6 +585,7 @@ jobs:
         else
           echo "[Debug] '${release}' did not match '${{ env.target_release_string }}'" && false
         fi
+        echo "matched_release=${release}" >> $GITHUB_ENV
 
     - name: List of packages remain installed from source system
       id: list-remain-packages
@@ -635,8 +629,9 @@ jobs:
         result-encoding: string
         script: |
           core.summary
+              .addHeading('Upgraded to: ${{ env.matched_release }}', '4')
               .addHeading('ELevate packages from ${{ inputs.repository }}:', '4')
               .addList([${{ env.pkgs_versions }}], true)
               .addHeading('${{ env.source_distro }}${{ env.source_release }} packages remain installed:', '4')
               .addList([${{ env.remain_pkgs }}], true)
-              .write()
+              .write()
diff --git a/files/almalinux/config.json b/files/almalinux/config.json
@@ -126,6 +126,14 @@
         "rhel10-CRB": {
             "in_packageset": "crb",
             "out_packageset": "almalinux10-crb"
+        },
+        "rhel10-HighAvailability": {
+            "in_packageset": "highavailability",
+            "out_packageset": "almalinux10-highavailability"
+        },
+        "rhel10-SAP-Solutions": {
+            "in_packageset": "saphana",
+            "out_packageset": "almalinux10-saphana"
         }
     },
     "removable_repositories":[
@@ -150,7 +158,8 @@
         "rhel8-Advanced-Virt",
         "rhel8-ceph5",
 
-        "rhel9-ceph5"
+        "rhel9-ceph5",
+        "rhel9-Supplementary"
     ],
 
     "package_replacing": [
@@ -283,6 +292,21 @@
             "name": "openssl-libs",
             "initial_release": 9,
             "target_release": 9
+        },
+        {
+            "name": "redhat-cloud-client-configuration",
+            "initial_release": 7,
+            "target_release": 7
+        },
+        {
+            "name": "redhat-cloud-client-configuration",
+            "initial_release": 8,
+            "target_release": 8
+        },
+        {
+            "name": "redhat-cloud-client-configuration",
+            "initial_release": 8,
+            "target_release": 9
         }
     ],
 

diff --git a/files/almalinux/device_driver_deprecation_data.json b/files/almalinux/device_driver_deprecation_data.json
@@ -1,6 +1,8 @@
 {
   "provided_data_streams": [
-    "3.1"
+    "3.0",
+    "3.1",
+    "3.2"
   ],
   "data": [
     {
@@ -4490,13 +4492,22 @@
       ],
       "deprecation_announced": "",
       "device_id": "0x15B3:0xA2DC",
-      "device_name": "",
+      "device_name": "BlueField-3 integrated ConnectX-7 network controller",
       "device_type": "pci",
       "driver_name": "mlx5",
       "maintained_in_rhel": [
         7
       ]
     },
+    {
+      "available_in_rhel": [],
+      "deprecation_announced": "",
+      "device_id": "0x15B3:0xA2DF",
+      "device_name": "BlueField-4 integrated ConnectX-8 network controller",
+      "device_type": "pci",
+      "driver_name": "mlx5",
+      "maintained_in_rhel": []
+    },
     {
       "available_in_rhel": [
         7,
@@ -6061,5 +6072,5 @@
       "maintained_in_rhel": []
     }
   ],
-  "created_at": "20240827083007"
+  "created_at": "20241127160819"
 }