add el9 support

EGI-Federation · Jun 4, 2024 · 5d9a74e · 5d9a74e
1 parent a3d2129
commit 5d9a74e
Show file tree

Hide file tree

Showing 4 changed files with 112 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,6 +27,28 @@ jobs:
           path: |
             build/RPMS/x86_64/wn-*.el7.x86_64.rpm
 
+  almalinux9:
+    name: Build AlmaLinux 9 RPMs
+    runs-on: ubuntu-latest
+    container: almalinux:9
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Install build requisites
+        run: |
+          dnf install -y rpm-build rpmlint make rsync systemd-rpm-macros
+      - name: build rpm
+        run: |
+          make clean rpm
+          rpmlint --file .rpmlint.ini build/RPMS/x86_64/*.rpm
+      - name: Upload RPMs
+        uses: actions/upload-artifact@v3
+        with:
+          name: rpms9
+          path: |
+            build/RPMS/x86_64/wn-*.el9.x86_64.rpm
+
   centos7-install:
     name: Install CentOS 7 RPMs
     needs: centos7
@@ -41,3 +63,18 @@ jobs:
           yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
           yum install -y http://repository.egi.eu/sw/production/umd/4/centos7/x86_64/updates/umd-release-4.1.3-1.el7.centos.noarch.rpm
           yum localinstall -y wn-*.rpm
+
+  almalinux9-install:
+    name: Install AlmaLinux 9 RPMs
+    needs: almalinux9
+    runs-on: ubuntu-latest
+    container: almalinux:9
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: rpms9
+      - name: Install generated RPMs
+        run: |
+          # FIXME: add UMD5 when available
+          dnf install -y epel-release
+          dnf localinstall -y wn-*.rpm
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,6 +33,28 @@ jobs:
             build/RPMS/x86_64/wn-*.el7.x86_64.rpm
             build/SRPMS/wn-*.el7.src.rpm
 
+  almalinux9:
+    name: Build AlmaLinux 9 RPMs
+    runs-on: ubuntu-latest
+    container: almalinux:9
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Install build requisites
+        run: |
+          dnf install -y rpm-build make rsync systemd-rpm-macros
+      - name: build rpm
+        run: |
+          make clean rpm
+      - name: Upload RPMs
+        uses: actions/upload-artifact@v4
+        with:
+          name: rpms9
+          path: |
+            build/RPMS/x86_64/wn-*.el9.x86_64.rpm
+            build/SRPMS/wn-*.el9.src.rpm
+
   release7:
     name: Upload CentOS 7 release artefacts
     needs: centos7
@@ -59,3 +81,30 @@ jobs:
           files: |
             ${{ steps.package_name_centos7.outputs.rpm_path }}
             ${{ steps.package_name_centos7.outputs.src_path }}
+
+  release9:
+    name: Upload AlmaLinux 9 release artefacts
+    permissions:
+      contents: write # to upload release asset (softprops/action-gh-release)
+    needs: almalinux9
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: rpms9
+      - name: Find package name
+        id: package_name_almalinux9
+        run: |
+          rpm_path=$(find . -name 'wn-*.el9.x86_64.rpm')
+          src_path=$(find . -name 'wn-*.el9.src.rpm')
+          echo "rpm_path=${rpm_path}" >> "$GITHUB_OUTPUT"
+          echo "src_path=${src_path}" >> "$GITHUB_OUTPUT"
+      - name: Attach AlmaLinux 9 RPMs to the release
+        uses: softprops/action-gh-release@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          fail_on_unmatched_files: true
+          files: |
+            ${{ steps.package_name_almalinux9.outputs.rpm_path }}
+            ${{ steps.package_name_almalinux9.outputs.src_path }}
diff --git a/CHANGELOG b/CHANGELOG
@@ -7,6 +7,9 @@ and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [5.0.0]
+- Added support for el9 (Andrea Manzi) (#2)
 - Drop support for RHEL6 (Baptiste Grenier) (#1)
 
 ## [4.0.5]

diff --git a/wn.spec b/wn.spec
@@ -1,7 +1,7 @@
 %global debug_package %{nil}
 
 Name: wn
-Version: 4.0.5
+Version: 5.0.0
 Release: 1%{?dist}
 Summary: Worker Node meta-package
 Group: Applications/Internet
@@ -11,43 +11,49 @@ Source: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
 
 Requires: c-ares
-Requires: cleanup-grid-accounts
-Requires: cvmfs
-Requires: dcache-srmclient
 Requires: dcap
 Requires: dcap-devel
 Requires: dcap-libs
 Requires: dcap-tunnel-gsi
 Requires: dcap-tunnel-krb
 Requires: dcap-tunnel-ssl
 Requires: dcap-tunnel-telnet
+%if 0%{?rhel} == 7
+Requires: cvmfs
+Requires: cleanup-grid-accounts
+Requires: dcache-srmclient
 Requires: dpm
 Requires: libdpm.so.1()(64bit),  dpm-libs
 Requires: dpm-devel
 Requires: dpm-perl
 Requires: dpm-python
-Requires: fetch-crl
-Requires: gfal2-all
-Requires: gfal2-python
-Requires: gfal2-util
 Requires: gfalFS
-Requires: gfal2-all
-Requires: gfal2-doc
-Requires: gfal2-devel
 Requires: ginfo
 Requires: lcg-info
+Requires: lcg-infosites
 Requires: lcg-ManageVOTag
 Requires: lcg-tags
 Requires: lcgdm-devel
-Requires: globus-gass-copy-progs
-Requires: globus-proxy-utils
 Requires: glite-yaim-core
-Requires: gridsite-libs
-Requires: lcg-infosites
 Requires: lfc
 Requires: lfc-devel
 Requires: lfc-perl
 Requires: liblfc.so.1()(64bit), lfc-libs
+%endif
+Requires: fetch-crl
+Requires: gfal2-all
+Requires: gfal2-all
+%if 0%{?rhel} == 7
+Requires: gfal2-python
+%else
+Requires: gfal2-python3
+%endif
+Requires: gfal2-all
+Requires: gfal2-doc
+Requires: gfal2-devel
+Requires: globus-gass-copy-progs
+Requires: globus-proxy-utils
+Requires: gridsite-libs
 Requires: openldap-clients
 Requires: python-ldap
 Requires: uberftp
@@ -76,6 +82,8 @@ rm -rf %{buildroot}
 %doc /usr/share/doc/wn/README.md
 
 %changelog
+* Tue Jun 04 2024 Andrea Manzi <[email protected]> - 5.0.0-1
+- Add support for EL9
 * Thu Jun 01 2017 Andrea Manzi <[email protected]> - 4.0.5-1
 - renamed to wn
 * Wed May 24 2017 Andrea Manzi <[email protected]> - 4.0.4-1