From a981c4dc6c1595b0ddf3b01b29f1ac3b0e541650 Mon Sep 17 00:00:00 2001 From: Baptiste Grenier Date: Tue, 11 Jun 2024 09:38:27 +0200 Subject: [PATCH 1/9] Build on RHEL8 --- .github/workflows/build.yml | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3fac207..f4427a1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,10 +27,13 @@ jobs: path: | build/RPMS/x86_64/wn-*.el7.x86_64.rpm - almalinux9: - name: Build AlmaLinux 9 RPMs + build-almalinux: + strategy: + matrix: + almalinux-version: [8, 9] + name: Build AlmaLinux ${{ matrix.almalinux-version }} RPMs runs-on: ubuntu-latest - container: almalinux:9 + container: almalinux:${{ matrix.almalinux-version }} steps: - uses: actions/checkout@v4 with: @@ -45,9 +48,9 @@ jobs: - name: Upload RPMs uses: actions/upload-artifact@v3 with: - name: rpms9 + name: rpms${{ matrix.almalinux-version }} path: | - build/RPMS/x86_64/wn-*.el9.x86_64.rpm + build/RPMS/x86_64/wn-*.el${{ matrix.almalinux-version }}.x86_64.rpm centos7-install: name: Install CentOS 7 RPMs @@ -64,15 +67,18 @@ jobs: 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 + install-almalinux: + strategy: + matrix: + almalinux-version: [8, 9] + name: Install AlmaLinux ${{ matrix.almalinux-version }} RPMs + needs: build-almalinux${{ matrix.almalinux-version }} runs-on: ubuntu-latest - container: almalinux:9 + container: almalinux:${{ matrix.almalinux-version }} steps: - uses: actions/download-artifact@v3 with: - name: rpms9 + name: rpms${{ matrix.almalinux-version }} - name: Install generated RPMs run: | # FIXME: add UMD5 when available From 9017451477ebc056cc831f4e9638c1fbad891806 Mon Sep 17 00:00:00 2001 From: Baptiste Grenier Date: Tue, 11 Jun 2024 09:42:26 +0200 Subject: [PATCH 2/9] Release on RHEL8 --- .github/workflows/release.yml | 44 +++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aaf739f..9e7b145 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,10 +33,13 @@ jobs: build/RPMS/x86_64/wn-*.el7.x86_64.rpm build/SRPMS/wn-*.el7.src.rpm - almalinux9: - name: Build AlmaLinux 9 RPMs + build-almalinux: + strategy: + matrix: + almalinux-version: [8, 9] + name: Build AlmaLinux ${{ matrix.almalinux-version }} RPMs runs-on: ubuntu-latest - container: almalinux:9 + container: almalinux:${{ matrix.almalinux-version }} steps: - uses: actions/checkout@v4 with: @@ -50,10 +53,10 @@ jobs: - name: Upload RPMs uses: actions/upload-artifact@v4 with: - name: rpms9 + name: rpms${{ matrix.almalinux-version }} path: | - build/RPMS/x86_64/wn-*.el9.x86_64.rpm - build/SRPMS/wn-*.el9.src.rpm + build/RPMS/x86_64/wn-*.el${{ matrix.almalinux-version }}.x86_64.rpm + build/SRPMS/wn-*.el${{ matrix.almalinux-version }}.src.rpm release7: name: Upload CentOS 7 release artefacts @@ -82,11 +85,38 @@ jobs: ${{ steps.package_name_centos7.outputs.rpm_path }} ${{ steps.package_name_centos7.outputs.src_path }} + release8: + name: Upload AlmaLinux 8 release artefacts + permissions: + contents: write # to upload release asset (softprops/action-gh-release) + needs: build-almalinux + runs-on: ubuntu-latest + steps: + - uses: actions/download-artifact@v4 + with: + name: rpms8 + - name: Find package name + id: package_name_almalinux8 + run: | + rpm_path=$(find . -name 'wn-*.el8.x86_64.rpm') + src_path=$(find . -name 'wn-*.el8.src.rpm') + echo "rpm_path=${rpm_path}" >> "$GITHUB_OUTPUT" + echo "src_path=${src_path}" >> "$GITHUB_OUTPUT" + - name: Attach AlmaLinux 8 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_almalinux8.outputs.rpm_path }} + ${{ steps.package_name_almalinux8.outputs.src_path }} + release9: name: Upload AlmaLinux 9 release artefacts permissions: contents: write # to upload release asset (softprops/action-gh-release) - needs: almalinux9 + needs: build-almalinux runs-on: ubuntu-latest steps: - uses: actions/download-artifact@v4 From ebd37eb108831ee07fe59aa22890e7d0a5fc2863 Mon Sep 17 00:00:00 2001 From: Baptiste Grenier Date: Tue, 11 Jun 2024 09:45:02 +0200 Subject: [PATCH 3/9] Prepare 5.1.0 with support for RHEL8 --- CHANGELOG | 3 +++ wn.spec | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index ce2970a..282da01 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,9 @@ and this project adheres to ## [Unreleased] +## [5.1.0] +- Added support for RHEL8 (Baptiste Grenier) (#4) + ## [5.0.0] - Added support for el9 (Andrea Manzi) (#2) - Drop support for RHEL6 (Baptiste Grenier) (#1) diff --git a/wn.spec b/wn.spec index 7cb722a..46469ee 100644 --- a/wn.spec +++ b/wn.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: wn -Version: 5.0.0 +Version: 5.1.0 Release: 1%{?dist} Summary: Worker Node meta-package Group: Applications/Internet @@ -82,6 +82,8 @@ rm -rf %{buildroot} %doc /usr/share/doc/wn/README.md %changelog +* Tue Jun 11 2024 Baptiste Grenier - 5.1.0-1 +- Add support for RHEL8 (Baptiste Grenier) (#4) * Tue Jun 04 2024 Andrea Manzi - 5.0.0-1 - Add support for EL9 * Thu Jun 01 2017 Andrea Manzi - 4.0.5-1 From 81049c4f96ed94a18564a70ebfc876746eb44cd1 Mon Sep 17 00:00:00 2001 From: Baptiste Grenier Date: Tue, 11 Jun 2024 09:45:34 +0200 Subject: [PATCH 4/9] build: fix dependency --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f4427a1..ef54b56 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,7 +72,7 @@ jobs: matrix: almalinux-version: [8, 9] name: Install AlmaLinux ${{ matrix.almalinux-version }} RPMs - needs: build-almalinux${{ matrix.almalinux-version }} + needs: build-almalinux runs-on: ubuntu-latest container: almalinux:${{ matrix.almalinux-version }} steps: From c83c6450093d39290fe71cbbd6c0092f5536db52 Mon Sep 17 00:00:00 2001 From: Baptiste Grenier Date: Tue, 11 Jun 2024 10:03:39 +0200 Subject: [PATCH 5/9] build: powertools repository is required on RHEL8 --- .github/workflows/build.yml | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ef54b56..da701ab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,18 +67,31 @@ jobs: 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 - install-almalinux: - strategy: - matrix: - almalinux-version: [8, 9] - name: Install AlmaLinux ${{ matrix.almalinux-version }} RPMs + install-almalinux8: + name: Install AlmaLinux 8 RPMs needs: build-almalinux runs-on: ubuntu-latest - container: almalinux:${{ matrix.almalinux-version }} + container: almalinux:8 steps: - uses: actions/download-artifact@v3 with: - name: rpms${{ matrix.almalinux-version }} + name: rpms8 + - name: Install generated RPMs + run: | + # FIXME: add UMD5 when available + dnf install -y epel-release + dnf config-manager --set-enabled powertools + dnf localinstall -y wn-*.rpm + + install-almalinux9: + name: Install AlmaLinux 9 RPMs + needs: build-almalinux + 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 From 6166859f4e582e2f1f1e3386d435aea4d7fd3c2e Mon Sep 17 00:00:00 2001 From: Baptiste Grenier Date: Tue, 11 Jun 2024 10:04:29 +0200 Subject: [PATCH 6/9] spec: use python3-ldap when not on RHEL7 --- wn.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wn.spec b/wn.spec index 46469ee..11a08d5 100644 --- a/wn.spec +++ b/wn.spec @@ -55,7 +55,11 @@ Requires: globus-gass-copy-progs Requires: globus-proxy-utils Requires: gridsite-libs Requires: openldap-clients +%if 0%{?rhel} == 7 Requires: python-ldap +%else +Requires: python3-ldap +%endif Requires: uberftp Requires: voms-clients-java Requires: voms-devel From 48b63a92d5e66fd66061aee2e00a97b543b41cf2 Mon Sep 17 00:00:00 2001 From: Baptiste Grenier Date: Mon, 17 Jun 2024 10:11:32 +0200 Subject: [PATCH 7/9] Install CVMFS on all RHEL versions --- wn.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wn.spec b/wn.spec index 11a08d5..38aba72 100644 --- a/wn.spec +++ b/wn.spec @@ -11,6 +11,7 @@ Source: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: c-ares +Requires: cvmfs Requires: dcap Requires: dcap-devel Requires: dcap-libs @@ -19,7 +20,6 @@ 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 From da430c79c04e18d6a3c338a2e29300ffc92e77e4 Mon Sep 17 00:00:00 2001 From: Baptiste Grenier Date: Mon, 17 Jun 2024 10:17:02 +0200 Subject: [PATCH 8/9] build: use upstream CVMFS repo for now --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index da701ab..4f4fc3a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,6 +80,7 @@ jobs: run: | # FIXME: add UMD5 when available dnf install -y epel-release + dn install -y https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest.noarch.rpm dnf config-manager --set-enabled powertools dnf localinstall -y wn-*.rpm @@ -96,4 +97,5 @@ jobs: run: | # FIXME: add UMD5 when available dnf install -y epel-release + dn install -y https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest.noarch.rpm dnf localinstall -y wn-*.rpm From c8c1a32d0150f346669e2232a3262e26f8886806 Mon Sep 17 00:00:00 2001 From: Baptiste Grenier Date: Mon, 17 Jun 2024 10:20:37 +0200 Subject: [PATCH 9/9] build: fix typo --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4f4fc3a..203c1a6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,7 +80,7 @@ jobs: run: | # FIXME: add UMD5 when available dnf install -y epel-release - dn install -y https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest.noarch.rpm + dnf install -y https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest.noarch.rpm dnf config-manager --set-enabled powertools dnf localinstall -y wn-*.rpm @@ -97,5 +97,5 @@ jobs: run: | # FIXME: add UMD5 when available dnf install -y epel-release - dn install -y https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest.noarch.rpm + dnf install -y https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest.noarch.rpm dnf localinstall -y wn-*.rpm