Merge pull request #100 from CESNET/fix-ci-change-centos-to-rockylinux

ci: change centos to rockylinux
CESNET · Aug 5, 2024 · 8bfa734 · 8bfa734
2 parents 10833f2 + dee93d7
commit 8bfa734
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -21,7 +21,7 @@ jobs:
           - 'debian:buster'
           - 'debian:bullseye'
           - 'debian:bookworm'
-          - 'quay.io/centos/centos:stream8'
+          - 'rockylinux:8'
           - 'oraclelinux:8'
           - 'oraclelinux:9'
 
@@ -39,8 +39,8 @@ jobs:
         apt-get -y install librdkafka-dev
       env:
         DEBIAN_FRONTEND: noninteractive
-    - name: Enable additional repositories (CentOS Steam)
-      if: contains(matrix.image, 'centos:stream')
+    - name: Enable additional repositories (Rocky Linux)
+      if: contains(matrix.image, 'rockylinux')
       run: |
         dnf -y install 'dnf-command(config-manager)'
         dnf config-manager --set-enabled appstream powertools
@@ -54,8 +54,8 @@ jobs:
       run: |
         dnf -y install 'dnf-command(config-manager)'
         dnf config-manager --set-enabled ol9_appstream ol9_codeready_builder
-    - name: Enable EPEL (CentOS)
-      if: contains(matrix.image, 'centos')
+    - name: Enable EPEL (Rocky Linux)
+      if: contains(matrix.image, 'rockylinux')
       run: |
         yum -y install epel-release
     - name: Enable EPEL (Oracle Linux 8)
@@ -66,8 +66,8 @@ jobs:
       if: contains(matrix.image, 'oraclelinux:9')
       run: |
         dnf -y install oracle-epel-release-el9
-    - name: Install dependencies for libfds and IPFIXcol2 (CentOS, Oracle Linux)
-      if: contains(matrix.image, 'centos') || contains(matrix.image, 'oraclelinux')
+    - name: Install dependencies for libfds and IPFIXcol2 (Rocky Linux, Oracle Linux)
+      if: contains(matrix.image, 'rockylinux') || contains(matrix.image, 'oraclelinux')
       run: |
         yum -y install git gcc gcc-c++ cmake make libxml2-devel lz4-devel libzstd-devel
         yum -y install zlib-devel pkgconfig librdkafka-devel
@@ -95,10 +95,8 @@ jobs:
     - name: Build and install IPFIXcol2
       run: |
         mkdir build && cd build
-        cmake .. -DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTS=$TESTS
+        cmake .. -DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTS=1
         make && make install
-      env:
-        TESTS: ${{ startsWith(matrix.image, 'centos:7') != true }}
     - name: Run tests
       run: cd build && make test
     - name: Try to run IPFIXcol2

diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
@@ -91,7 +91,7 @@ jobs:
       fail-fast: false
       matrix:
         image:
-          - 'quay.io/centos/centos:stream8'
+          - 'rockylinux:8'
           - 'oraclelinux:8'
           - 'oraclelinux:9'
 
@@ -113,8 +113,8 @@ jobs:
         mkdir -p build/libfds_repo
 
     # Dependencies ---------------------------------------------------------------------------
-    - name: Enable additional repositories (CentOS Stream)
-      if: contains(matrix.image, 'centos:stream')
+    - name: Enable additional repositories (Rocky Linux)
+      if: contains(matrix.image, 'rockylinux')
       run: |
         dnf -y install 'dnf-command(config-manager)'
         dnf config-manager --set-enabled appstream powertools
@@ -128,8 +128,8 @@ jobs:
       run: |
         dnf -y install 'dnf-command(config-manager)'
         dnf config-manager --set-enabled ol9_appstream ol9_codeready_builder
-    - name: Enable EPEL (CentOS)
-      if: contains(matrix.image, 'centos')
+    - name: Enable EPEL (Rocky Linux)
+      if: contains(matrix.image, 'Rocky Linux')
       run: |
         yum -y install epel-release
     - name: Enable EPEL (Oracle Linux 8)
@@ -140,8 +140,8 @@ jobs:
       if: contains(matrix.image, 'oraclelinux:9')
       run: |
         dnf -y install oracle-epel-release-el9
-    - name: Install dependencies for libfds and IPFIXcol2 (CentOS, Oracle Linux)
-      if: contains(matrix.image, 'centos') || contains(matrix.image, 'oraclelinux')
+    - name: Install dependencies for libfds and IPFIXcol2 (Rocky Linux, Oracle Linux)
+      if: contains(matrix.image, 'rockylinux') || contains(matrix.image, 'oraclelinux')
       run: |
         yum -y install git gcc gcc-c++ cmake make libxml2-devel lz4-devel libzstd-devel
         yum -y install zlib-devel pkgconfig rpm-build librdkafka-devel