Make rpm for el9 (#608)

This also removes support for ubuntu kinetic which is now deprecated.
kentik · Sep 14, 2023 · 5cc2818 · 5cc2818
1 parent af663cb
commit 5cc2818
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 9 deletions.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -15,31 +15,37 @@ jobs:
             release: 7
             pkg: rpm
             pkg_name: el
+            image: centos
           - distro: centos
             release: 8
             pkg: rpm
             pkg_name: el
+            image: centos
+          - distro: ubi9
+            release: 9.2
+            pkg: rpm
+            pkg_name: el
+            image: redhat/ubi9
 
           - distro: ubuntu
             release: focal
             pkg: deb
             pkg_name: ubuntu
+            image: ubuntu
           - distro: ubuntu
             release: jammy
             pkg: deb
             pkg_name: ubuntu
-          - distro: ubuntu
-            release: kinetic
-            pkg: deb
-            pkg_name: ubuntu
+            image: ubuntu
 
           - distro: debian
             release: bullseye
             pkg: deb
             pkg_name: debian
+            image: debian
 
     container:
-      image: ${{ matrix.distro }}:${{ matrix.release }}
+      image: ${{ matrix.image }}:${{ matrix.release }}
 
     steps:
       - name: Checkout code
@@ -70,6 +76,9 @@ jobs:
               yum install -y make gcc diffutils ruby-devel redhat-rpm-config gcc-c++
               dnf -y --enablerepo=powertools install libpcap-devel
             fi
+          elif [ "${{ matrix.distro }}" = "ubi9" ]
+          then
+            yum install -y make gcc diffutils libpcap-devel
           else
             apt-get update
             apt-get -y install make libpcap-dev ca-certificates build-essential curl ruby ruby-dev

diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml
@@ -20,25 +20,31 @@ jobs:
           - distro: centos
             release: 7
             pkg: rpm
+            image: centos
           - distro: centos
             release: 8
             pkg: rpm
+            image: centos
+          - distro: ubi9
+            release: 9.2
+            pkg: rpm
+            image: redhat/ubi9
 
           - distro: ubuntu
             release: focal
             pkg: deb
+            image: ubuntu
           - distro: ubuntu
             release: jammy
             pkg: deb
-          - distro: ubuntu
-            release: kinetic
-            pkg: deb
+            image: ubuntu
 
           - distro: debian
             release: bullseye
             pkg: deb
+            image: debian
     container:
-      image: ${{ matrix.distro }}:${{ matrix.release }}
+      image: ${{ matrix.image }}:${{ matrix.release }}
 
     # NB: any run steps that need chf src need to have `working-directory: ${{ env.SRCDIR }}`
     steps:
@@ -67,6 +73,9 @@ jobs:
               yum install -y make gcc diffutils
               dnf -y --enablerepo=powertools install libpcap-devel
             fi
+          elif [ "${{ matrix.distro }}" = "ubi9" ]
+          then
+            yum install -y make gcc diffutils libpcap-devel
           else
             apt-get update
             apt-get -y install make libpcap-dev ca-certificates build-essential curl