Added CentOS-Stream to distros

Containers added netdata/helper-images#219
k0ste · Aug 4, 2023 · 97e5ede · 97e5ede
1 parent ca1b3ee
commit 97e5ede
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 16 deletions.
diff --git a/.github/data/distros.yml b/.github/data/distros.yml
@@ -108,7 +108,6 @@ include:
       <<: *amzn_packages
       repo_distro: amazonlinux/2023
 
-
   - distro: centos
     version: "7"
     support_type: Core
@@ -125,6 +124,30 @@ include:
     test:
       ebpf-core: false
 
+  - &centos_stream
+    distro: centos-stream
+    base_image: 'quay.io/centos/centos:stream9'
+    version: '9'
+    support_type: 'Community'
+    notes: ''
+    jsonc_removal: |
+      dnf remove -y json-c-devel
+    eol_check: true
+    packages: &cs_packages
+      type: rpm
+      repo_distro: el/c9s
+      arches:
+        - x86_64
+        - aarch64
+    test:
+      ebpf-core: true
+  - <<: *centos_stream
+    version: '8'
+    base_image: 'quay.io/centos/centos:stream8'
+    packages:
+      <<: *cs_packages
+      repo_distro: el/c8s
+
   - &debian
     distro: debian
     version: "12"

diff --git a/.github/scripts/ci-support-pkgs.sh b/.github/scripts/ci-support-pkgs.sh
@@ -8,8 +8,9 @@ set -e
 . /etc/os-release
 
 case "${ID}" in
-    amzn|almalinux|centos|fedora)
-        dnf install -y procps-ng cronie cronie-anacron || yum install -y procps-ng cronie cronie-anacron
+    amzn|almalinux|centos|centos-stream|fedora)
+        dnf install -y procps-ng cronie cronie-anacron || \
+        yum install -y procps-ng cronie cronie-anacron
         ;;
     arch)
         pacman -S --noconfirm cronie

diff --git a/.github/scripts/pkg-test.sh b/.github/scripts/pkg-test.sh
@@ -14,7 +14,8 @@ install_debian_like() {
 
   # Install Netdata
   # Strange quoting is required here so that glob matching works.
-  apt-get install -y $(find /netdata/artifacts -type f -name 'netdata*.deb' ! -name '*dbgsym*' ! -name '*cups*' ! -name '*freeipmi*') || exit 3
+  apt-get install -y "$(find /netdata/artifacts -type f -name 'netdata*.deb' \
+! -name '*dbgsym*' ! -name '*cups*' ! -name '*freeipmi*')" || exit 3
 
   # Install testing tools
   apt-get install -y --no-install-recommends curl "${netcat}" jq || exit 1
@@ -32,10 +33,10 @@ install_fedora_like() {
 
   # Install Netdata
   # Strange quoting is required here so that glob matching works.
-  "$PKGMGR" install -y /netdata/artifacts/netdata*.rpm || exit 1
+  "${PKGMGR}" install -y /netdata/artifacts/netdata*.rpm || exit 1
 
   # Install testing tools
-  "$PKGMGR" install -y curl nc jq || exit 1
+  "${PKGMGR}" install -y curl nc jq || exit 1
 }
 
 install_centos() {
@@ -49,15 +50,15 @@ install_centos() {
   fi
 
   # Install EPEL (needed for `jq`
-  "$PKGMGR" install -y epel-release || exit 1
+  "${PKGMGR}" install -y epel-release || exit 1
 
   # Install Netdata
   # Strange quoting is required here so that glob matching works.
-  "$PKGMGR" install -y /netdata/artifacts/netdata*.rpm || exit 1
+  "${PKGMGR}" install -y /netdata/artifacts/netdata*.rpm || exit 1
 
   # Install testing tools
   # shellcheck disable=SC2086
-  "$PKGMGR" install -y ${opts} curl nc jq || exit 1
+  "${PKGMGR}" install -y ${opts} curl nc jq || exit 1
 }
 
 install_amazon_linux() {
@@ -69,11 +70,11 @@ install_amazon_linux() {
 
   # Install Netdata
   # Strange quoting is required here so that glob matching works.
-  "$PKGMGR" install -y /netdata/artifacts/netdata*.rpm || exit 1
+  "${PKGMGR}" install -y /netdata/artifacts/netdata*.rpm || exit 1
 
   # Install testing tools
   # shellcheck disable=SC2086
-  "$PKGMGR" install -y ${opts} curl nc jq || exit 1
+  "${PKGMGR}" install -y ${opts} curl nc jq || exit 1
 }
 
 install_suse_like() {
@@ -130,7 +131,7 @@ case "${DISTRO}" in
   fedora | oraclelinux)
     install_fedora_like
     ;;
-  centos | rockylinux | almalinux)
+  centos| centos-stream | rockylinux | almalinux)
     install_centos
     ;;
   amazonlinux)

diff --git a/packaging/installer/install-required-packages.sh b/packaging/installer/install-required-packages.sh
@@ -180,7 +180,7 @@ get_os_release() {
   eval "$(grep -E "^(NAME|ID|ID_LIKE|VERSION|VERSION_ID)=" "${os_release_file}")"
   for x in "${ID}" ${ID_LIKE}; do
     case "${x,,}" in
-      almalinux | alpine | arch | centos | clear-linux-os | debian | fedora | gentoo | manjaro | opensuse-leap | opensuse-tumbleweed | ol | rhel | rocky | sabayon | sles | suse | ubuntu)
+      almalinux | alpine | arch | centos | centos-stream | clear-linux-os | debian | fedora | gentoo | manjaro | opensuse-leap | opensuse-tumbleweed | ol | rhel | rocky | sabayon | sles | suse | ubuntu)
         distribution="${x}"
         if [ "${ID}" = "opensuse-tumbleweed" ]; then
           version="tumbleweed"
@@ -406,7 +406,7 @@ detect_package_manager_from_distribution() {
       fi
       ;;
 
-    centos* | clearos* | rocky* | almalinux*)
+    centos* | centos-stream* | clearos* | rocky* | almalinux*)
       package_installer=""
       tree="centos"
       [ -n "${yum}" ] && package_installer="install_yum"

diff --git a/packaging/installer/kickstart.sh b/packaging/installer/kickstart.sh
@@ -684,7 +684,7 @@ get_system_info() {
               DISTRO_COMPAT_NAME="opensuse"
               SYSVERSION="tumbleweed"
               ;;
-          cloudlinux|almalinux|rocky|rhel)
+          cloudlinux|almalinux|centos-stream|rocky|rhel)
               DISTRO_COMPAT_NAME="centos"
               ;;
           artix|manjaro|obarun)

diff --git a/packaging/installer/netdata-updater.sh b/packaging/installer/netdata-updater.sh
@@ -737,7 +737,7 @@ update_binpkg() {
       opensuse-leap|opensuse-tumbleweed)
         DISTRO_COMPAT_NAME="opensuse"
         ;;
-      cloudlinux|almalinux|rocky|rhel)
+      cloudlinux|almalinux|centos-stream|rocky|rhel)
         DISTRO_COMPAT_NAME="centos"
         ;;
       *)