Prepare new release, build with AlmaLinux, drop deprecated meta-packa…

…ges. (#3) Prepare new release, build with AlmaLinux, drop deprecated meta-packages. This PR/documentation assumes that we will always build/release all the meta-packages for every new GitHub tag/release. The packages versions and the tag are currently aligned, but in the future we could expect that they could diverge/no more be synchronised if only one package is updated. ## [1.1.0] - 2023-03-17 ### Changed - emi-bdii-site 1.1.0: update and package documentation, build using GitHub actions (#2) (Baptiste Grenier) - emi-bdii-top 1.1.0: update and package documentation, build using GitHub actions (#2) (Baptiste Grenier) - emi-resource-information-service 1.1.0: update and package documentation, build using GitHub actions (#2) (Baptiste Grenier)
EGI-Federation · Mar 24, 2023 · 723fdde · 723fdde
1 parent 7ebaaa9
commit 723fdde
Show file tree

Hide file tree

Showing 16 changed files with 115 additions and 266 deletions.
diff --git a/.github/linters/.yaml-lint.yml b/.github/linters/.yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+
+rules:
+  line-length:
+    max: 140
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,8 +8,9 @@ jobs:
   # XXX done outside of the build matrix due to different container name
   build-centos7:
     strategy:
+      fail-fast: false
       matrix:
-        rpm-name: [emi-bdii-site, emi-bdii-top, emi-resource-information-service, glite-BDII_site, glite-BDII_top]
+        rpm-name: [emi-bdii-site, emi-bdii-top, emi-resource-information-service]
     name: Build ${{ matrix.rpm-name }} CentOS 7 RPMs
     runs-on: ubuntu-latest
     container: quay.io/centos/centos:7
@@ -24,24 +25,26 @@ jobs:
           yum-builddep -y ${{ matrix.rpm-name }}.spec
       - name: build rpm
         run: |
+          cd ${{ matrix.rpm-name }}
           make clean rpm
           rpmlint --file .rpmlint.ini build/RPMS/noarch/*.el7.noarch.rpm
       - name: Upload RPMs
         uses: actions/upload-artifact@v3
         with:
-          name: rpms7
+          name: rpms7-${{ matrix.rpm-name }}
           path: |
-            build/RPMS/noarch/${{ matrix.rpm-name }}-*.el7.noarch.rpm
+            ${{ matrix.rpm-name }}/build/RPMS/noarch/${{ matrix.rpm-name }}-*.el7.noarch.rpm
 
-  # Use a matrix for CentOS Stream versions
+  # Use a matrix for AlmaLinux versions
   build:
     strategy:
+      fail-fast: false
       matrix:
-        centos-version: [8, 9]
-        rpm-name: [emi-bdii-site, emi-bdii-top, emi-resource-information-service, glite-BDII_site, glite-BDII_top]
-    name: Build CentOS ${{ matrix.rpm-name }} ${{ matrix.centos-version }} RPMs
+        almalinux-version: [8, 9]
+        rpm-name: [emi-bdii-site, emi-bdii-top, emi-resource-information-service]
+    name: Build ${{ matrix.rpm-name }} AlmaLinux ${{ matrix.almalinux-version }} RPMs
     runs-on: ubuntu-latest
-    container: quay.io/centos/centos:stream${{ matrix.centos-version }}
+    container: almalinux:${{ matrix.almalinux-version }}
     steps:
       - uses: actions/checkout@v3
         with:
@@ -53,19 +56,21 @@ jobs:
           yum-builddep -y ${{ matrix.rpm-name }}.spec
       - name: build rpm
         run: |
+          cd ${{ matrix.rpm-name }}
           make clean rpm
-          rpmlint --file .rpmlint.ini build/RPMS/noarch/*.el${{ matrix.centos-version }}.noarch.rpm
+          rpmlint --file .rpmlint.ini build/RPMS/noarch/*.el${{ matrix.almalinux-version }}.noarch.rpm
       - name: Upload RPMs
         uses: actions/upload-artifact@v3
         with:
-          name: rpms${{ matrix.centos-version }}-${{ matrix.rpm-name }}
+          name: rpms${{ matrix.almalinux-version }}-${{ matrix.rpm-name }}
           path: |
-            build/RPMS/noarch/${{ matrix.rpm-name }}-*.el${{ matrix.centos-version }}.noarch.rpm
+            ${{ matrix.rpm-name }}/build/RPMS/noarch/${{ matrix.rpm-name }}-*.el${{ matrix.almalinux-version }}.noarch.rpm
 
   install-centos7:
     strategy:
+      fail-fast: false
       matrix:
-        rpm-name: [emi-bdii-site, emi-bdii-top, emi-resource-information-service, glite-BDII_site, glite-BDII_top]
+        rpm-name: [emi-bdii-site, emi-bdii-top, emi-resource-information-service]
     name: Install ${{ matrix.rpm-name }} CentOS 7 RPMs
     needs: build-centos7
     runs-on: ubuntu-latest
@@ -76,35 +81,42 @@ jobs:
           name: rpms7-${{ matrix.rpm-name }}
       - name: Install generated RPMs
         run: |
-          yum localinstall -y  ${{ matrix.rpm-name }}-*.el7.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 ${{ matrix.rpm-name }}-*.el7.noarch.rpm
 
-  # Dependency from PowerTools: openldap-servers
-  centos8-install:
+  # FIXME: openldap-servers is in CentOS 8 Stream Powertools, but not in AlmaLinux PowerTools
+  # See https://bugs.almalinux.org/view.php?id=222
+  # Currently instaling using the package from devel repository
+  # See https://bugs.almalinux.org/view.php?id=100
+  # https://repo.almalinux.org/almalinux/8/devel/x86_64/os/Packages/
+  almalinux8-install:
     strategy:
+      fail-fast: false
       matrix:
-        rpm-name: [emi-bdii-site, emi-bdii-top, emi-resource-information-service, glite-BDII_site, glite-BDII_top]
-    name: Install ${{ matrix.rpm-name }} CentOS Stream 8 RPMs
+        rpm-name: [emi-bdii-site, emi-bdii-top, emi-resource-information-service]
+    name: Install ${{ matrix.rpm-name }} AlmaLinux 8 RPMs
     needs: build
     runs-on: ubuntu-latest
-    container: quay.io/centos/centos:stream8
+    container: almalinux:8
     steps:
       - uses: actions/download-artifact@v3
         with:
           name: rpms8-${{ matrix.rpm-name }}
       - name: Install generated RPMs
         run: |
-          sed -i 's/^enabled=0/enabled=1/' /etc/yum.repos.d/CentOS-Stream-PowerTools.repo
+          yum install -y https://repo.almalinux.org/almalinux/8/devel/x86_64/os/Packages/openldap-servers-2.4.46-18.el8.x86_64.rpm
           yum localinstall -y ${{ matrix.rpm-name }}-*.el8.noarch.rpm
 
   # XXX Dependencies from EPEL: openldap-servers
-  centos9-install:
+  almalinux9-install:
     strategy:
+      fail-fast: false
       matrix:
-        rpm-name: [emi-bdii-site, emi-bdii-top, emi-resource-information-service, glite-BDII_site, glite-BDII_top]
-    name: Install ${{ matrix.rpm-name }} CentOS Stream 9 RPMs
+        rpm-name: [emi-bdii-site, emi-bdii-top, emi-resource-information-service]
+    name: Install ${{ matrix.rpm-name }} AlmaLinux 9 RPMs
     needs: build
     runs-on: ubuntu-latest
-    container: quay.io/centos/centos:stream9
+    container: almalinux:9
     steps:
       - uses: actions/download-artifact@v3
         with:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -26,6 +26,8 @@ jobs:
           DEFAULT_BRANCH: main
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           MARKDOWN_CONFIG_FILE: .markdownlint.json
+          # No need to check for duplication in the meta-packages
+          VALIDATE_JSCPD: false
           # Only check new or edited files
           VALIDATE_ALL_CODEBASE: false
           # Fail on errors

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
   centos7:
     strategy:
       matrix:
-        rpm-name: [emi-bdii-site, emi-bdii-top, emi-resource-information-service, glite-BDII_site, glite-BDII_top]
+        rpm-name: [emi-bdii-site, emi-bdii-top, emi-resource-information-service]
     name: Build ${{ matrix.rpm-name }} CentOS 7 RPMs
     runs-on: ubuntu-latest
     container: quay.io/centos/centos:7
@@ -32,18 +32,18 @@ jobs:
       - name: Upload RPMs
         uses: actions/upload-artifact@v3
         with:
-          name: rpms7
+          name: rpms7-${{ matrix.rpm-name }}
           path: |
             build/RPMS/noarch/${{ matrix.rpm-name }}-*-1.el7.noarch.rpm
             build/SRPMS/${{ matrix.rpm-name }}-*-1.el7.src.rpm
 
-  centos8:
+  almalinux8:
     strategy:
       matrix:
-        rpm-name: [emi-bdii-site, emi-bdii-top, emi-resource-information-service, glite-BDII_site, glite-BDII_top]
-    name: Build ${{ matrix.rpm-name }} CentOS Stream 8 RPMs
+        rpm-name: [emi-bdii-site, emi-bdii-top, emi-resource-information-service]
+    name: Build ${{ matrix.rpm-name }} AlmaLinux 8 RPMs
     runs-on: ubuntu-latest
-    container: quay.io/centos/centos:stream8
+    container: almalinux:8
     steps:
       - uses: actions/checkout@v3
         with:
@@ -59,15 +59,18 @@ jobs:
       - name: Upload RPMs
         uses: actions/upload-artifact@v3
         with:
-          name: rpms8
+          name: rpms8-${{ matrix.rpm-name }}
           path: |
             build/RPMS/noarch/${{ matrix.rpm-name }}-*-1.el8.noarch.rpm
             build/SRPMS/${{ matrix.rpm-name }}-*-1.el8.src.rpm
 
-  centos9:
-    name: Build CentOS Stream 9 RPMs
+  almalinux9:
+    strategy:
+      matrix:
+        rpm-name: [emi-bdii-site, emi-bdii-top, emi-resource-information-service]
+    name: Build AlmaLinux 9 RPMs
     runs-on: ubuntu-latest
-    container: quay.io/centos/centos:stream9
+    container: almalinux:9
     steps:
       - uses: actions/checkout@v3
         with:
@@ -83,17 +86,17 @@ jobs:
       - name: Upload RPMs
         uses: actions/upload-artifact@v3
         with:
-          name: rpms9
+          name: rpms9-${{ matrix.rpm-name }}
           path: |
             build/RPMS/noarch/${{ matrix.rpm-name }}-*-1.el9.noarch.rpm
             build/SRPMS/${{ matrix.rpm-name }}-*-1.el9.src.rpm
 
   release7:
     strategy:
       matrix:
-        rpm-name: [emi-bdii-site, emi-bdii-top, emi-resource-information-service, glite-BDII_site, glite-BDII_top]
+        rpm-name: [emi-bdii-site, emi-bdii-top, emi-resource-information-service]
     name: Upload ${{ matrix.rpm-name }} CentOS 7 release artefacts
-    needs: centos7-${{ matrix.rpm-name }}
+    needs: centos7
     runs-on: ubuntu-latest
     steps:
       - uses: actions/download-artifact@v3
@@ -119,55 +122,55 @@ jobs:
   release8:
     strategy:
       matrix:
-        rpm-name: [emi-bdii-site, emi-bdii-top, emi-resource-information-service, glite-BDII_site, glite-BDII_top]
-    name: Upload ${{ matrix.rpm-name }} CentOS Stream 8 release artefacts
-    needs: centos8-${{ matrix.rpm-name }}
+        rpm-name: [emi-bdii-site, emi-bdii-top, emi-resource-information-service]
+    name: Upload ${{ matrix.rpm-name }} AlmaLinux 8 release artefacts
+    needs: almalinux8
     runs-on: ubuntu-latest
     steps:
       - uses: actions/download-artifact@v3
         with:
           name: rpms8-${{ matrix.rpm-name }}
       - name: Find package name
-        id: package_name_centos8
+        id: package_name_almalinux8
         run: |
           rpm_path=$(find . -name '${{ matrix.rpm-name }}-*-1.el8.noarch.rpm')
           src_path=$(find . -name '${{ matrix.rpm-name }}-*-1.el8.src.rpm')
           echo "rpm_path=${rpm_path}" >> "$GITHUB_OUTPUT"
           echo "src_path=${src_path}" >> "$GITHUB_OUTPUT"
-      - name: Attach CentOS Stream 8 RPMs to the release
+      - name: Attach AlmaLinux 8 RPMs to the release
         uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           fail_on_unmatched_files: true
           files: |
-            ${{ steps.package_name_centos8.outputs.rpm_path }}
-            ${{ steps.package_name_centos8.outputs.src_path }}
+            ${{ steps.package_name_almalinux8.outputs.rpm_path }}
+            ${{ steps.package_name_almalinux8.outputs.src_path }}
 
   release9:
     strategy:
       matrix:
-        rpm-name: [emi-bdii-site, emi-bdii-top, emi-resource-information-service, glite-BDII_site, glite-BDII_top]
+        rpm-name: [emi-bdii-site, emi-bdii-top, emi-resource-information-service]
     name: Upload ${{ matrix.rpm-name }} CentOS Stream 9 release artefacts
-    needs: centos9-${{ matrix.rpm-name }}
+    needs: almalinux9
     runs-on: ubuntu-latest
     steps:
       - uses: actions/download-artifact@v3
         with:
           name: rpms9-${{ matrix.rpm-name }}
       - name: Find package name
-        id: package_name_centos9
+        id: package_name_almalinux9
         run: |
           rpm_path=$(find . -name '${{ matrix.rpm-name }}-*-1.el9.noarch.rpm')
           src_path=$(find . -name '${{ matrix.rpm-name }}-*-1.el9.src.rpm')
           echo "rpm_path=${rpm_path}" >> "$GITHUB_OUTPUT"
           echo "src_path=${src_path}" >> "$GITHUB_OUTPUT"
-      - name: Attach CentOS Stream 9 RPMs to the release
+      - name: Attach AlmaLinux 9 RPMs to the release
         uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           fail_on_unmatched_files: true
           files: |
-            ${{ steps.package_name_centos9.outputs.rpm_path }}
-            ${{ steps.package_name_centos9.outputs.src_path }}
+            ${{ steps.package_name_almalinux9.outputs.rpm_path }}
+            ${{ steps.package_name_almalinux9.outputs.src_path }}
diff --git a/CHANGELOG b/CHANGELOG
@@ -7,3 +7,11 @@ and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [1.1.0] - 2023-03-17
+
+### Changed
+
+- emi-bdii-site 1.1.0: update and package documentation, build using GitHub actions (#2) (Baptiste Grenier)
+- emi-bdii-top 1.1.0: update and package documentation, build using GitHub actions (#2) (Baptiste Grenier)
+- emi-resource-information-service 1.1.0: update and package documentation, build using GitHub actions (#2) (Baptiste Grenier)
diff --git a/README.md b/README.md
@@ -4,6 +4,11 @@ This repository contains different meta packages for the BDII.
 BDII documentation is available at
 [gridinfo documentation site](https://gridinfo-documentation.readthedocs.io/).
 
+- [emi-bdii-site](./emi-bdii-site/): Meta-package for Site BDII.
+- [emi-bdii-top](./emi-bdii-top/): Meta-package for Top BDII.
+- [emi-resource-information-service](./emi-resource-information-service/): Meta-package
+  for the resource information service.
+
 ## Installing from packages
 
 ### On RHEL-based systems
@@ -46,9 +51,12 @@ The RPM will be available into the `build/RPMS` directory.
 - Prepare a PR with
   - Updating version and changelog in
     - [CHANGELOG](CHANGELOG)
-    - [gridinfo-meta-packages.spec](gridinfo-meta-packages.spec)
+    - The related meta-package(s)
 - Once the PR has been merged tag and release a new version in GitHub
-  - Packages will be built using GitHub Actions and attached to the release page
+  - Use of an arbitrary/global release version is required, as it covers all the
+    meta-packages at once
+  - All the meta-packages will be built using GitHub Actions and attached to the release
+    page
 
 ## History
 

diff --git a/emi-bdii-site/.rpmlint.ini b/emi-bdii-site/.rpmlint.ini
@@ -0,0 +1,4 @@
+from Config import *
+
+# Remove non issue about a devel-dependency due to package name
+addFilter(".*devel-dependency glite-info-static")
diff --git a/emi-bdii-site/emi-bdii-site.spec b/emi-bdii-site/emi-bdii-site.spec
@@ -1,7 +1,7 @@
 Name:          emi-bdii-site
-Version:       1.0.2
+Version:       1.1.0
 Release:       1%{?dist}
-Summary:       Metapackage for site BDII
+Summary:       Meta-package for Site BDII
 Group:         Unknown
 License:       ASL 2.0
 URL:           https://github.com/EGI-Foundation/gridinfo-meta-packages
@@ -23,10 +23,10 @@ Requires:      glite-info-static
 %setup -q
 
 %build
-rm -rf %{buildroot}
-make install prefix=%{buildroot}
 
 %install
+rm -rf %{buildroot}
+make install prefix=%{buildroot}
 
 %clean
 rm -rf %{buildroot}
@@ -37,6 +37,9 @@ rm -rf %{buildroot}
 %license /usr/share/licenses/%{name}-%{version}/LICENSE.txt
 
 %changelog
+* Fri Mar 17 2023 Baptiste Grenier <[email protected]> - 1.1.0-1
+- Build and release using GitHub Actions (#2) (Baptiste Grenier)
+
 * Fri Sep 04 2015 Maria Alandes <[email protected]> - 1.0.2-1
 - Removing yaim dependency (which is not available in CENTOS7)
 

diff --git a/emi-bdii-top/emi-bdii-top.spec b/emi-bdii-top/emi-bdii-top.spec
@@ -1,7 +1,7 @@
 Name:          emi-bdii-top
-Version:       1.0.3
+Version:       1.1.0
 Release:       2%{?dist}
-Summary:       Metapackage for Top BDII
+Summary:       Meta-package for Top BDII
 Group:         Unknown
 License:       ASL 2.0
 URL:           https://github.com/EGI-Foundation/gridinfo-meta-packages
@@ -23,10 +23,10 @@ Requires:      glite-info-update-endpoints
 %setup -q
 
 %build
-rm -rf %{buildroot}
-make install prefix=%{buildroot}
 
 %install
+rm -rf %{buildroot}
+make install prefix=%{buildroot}
 
 %clean
 rm -rf %{buildroot}
@@ -37,6 +37,9 @@ rm -rf %{buildroot}
 %license /usr/share/licenses/%{name}-%{version}/LICENSE.txt
 
 %changelog
+* Fri Mar 17 2023 Baptiste Grenier <[email protected]> - 1.1.0-1
+- Build and release using GitHub Actions (#2) (Baptiste Grenier)
+
 * Fri Sep 04 2015 Maria Alandes <[email protected]> - 1.0.3-2
 - Removing yaim dependeny (Which is not available in CENTOS7)