Browse Source

Support nativa packages for openSUSE tumbleweed (#14692)

Signed-off-by: Tasos Katsoulas <tasos@netdata.cloud>
Tasos Katsoulas 1 year ago
parent
commit
69d6b7f0ed

+ 9 - 3
.github/data/distros.yml

@@ -164,14 +164,14 @@ include:
 
   - &opensuse
     distro: opensuse
-    version: "15.4"
+    version: "tumbleweed"
     eol_check: true
-    base_image: opensuse/leap:15.4
+    base_image: opensuse/tumbleweed
     jsonc_removal: |
       zypper rm -y libjson-c-devel
     packages: &opensuse_packages
       type: rpm
-      repo_distro: opensuse/15.4
+      repo_distro: opensuse/tumbleweed
       arches:
         - x86_64
         - aarch64
@@ -183,6 +183,12 @@ include:
     packages:
       <<: *opensuse_packages
       repo_distro: opensuse/15.5
+  - <<: *opensuse
+    version: "15.4"
+    base_image: opensuse/leap:15.4
+    packages:
+      <<: *opensuse_packages
+      repo_distro: opensuse/15.4
 
   - &oracle
     distro: oraclelinux

+ 9 - 8
packaging/PLATFORM_SUPPORT.md

@@ -90,14 +90,15 @@ platforms that we officially support ourselves to the intermediate tier. Our [st
 expected to work on these platforms if available. Source-based installs are expected to work on these platforms
 with minimal user effort.
 
-| Platform      | Version | Official Native Packages | Notes                                                                                                |
-|---------------|---------|--------------------------|------------------------------------------------------------------------------------------------------|
-| Alpine Linux  | 3.16    | No                       |                                                                                                      |
-| Alpine Linux  | 3.15    | No                       |                                                                                                      |
-| Amazon Linux  | 2023    | x86\_64, AArch64         | Scheduled for promotion to Core tier at some point after the release of v1.39.0 of the Netdata Agent |
-| Amazon Linux  | 2       | x86\_64, AArch64         | Scheduled for promotion to Core tier at some point after the release of v1.39.0 of the Netdata Agent |
-| Arch Linux    | Latest  | No                       | We officially recommend the community packages available for Arch Linux                              |
-| Manjaro Linux | Latest  | No                       | We officially recommend the community packages available for Arch Linux                              |
+| Platform      | Version    | Official Native Packages | Notes                                                                                                |
+|---------------|------------|--------------------------|------------------------------------------------------------------------------------------------------|
+| Alpine Linux  | 3.16       | No                       |                                                                                                      |
+| Alpine Linux  | 3.15       | No                       |                                                                                                      |
+| Amazon Linux  | 2023       | x86\_64, AArch64         | Scheduled for promotion to Core tier at some point after the release of v1.39.0 of the Netdata Agent |
+| Amazon Linux  | 2          | x86\_64, AArch64         | Scheduled for promotion to Core tier at some point after the release of v1.39.0 of the Netdata Agent |
+| Arch Linux    | Latest     | No                       | We officially recommend the community packages available for Arch Linux                              |
+| Manjaro Linux | Latest     | No                       | We officially recommend the community packages available for Arch Linux                              |
+| openSUSE      | Tumbleweed | x86\_64, AArch64         | Scheduled for promotion to Core tier at some point after the release of v1.41.0 of the Netdata Agent |
 
 ### Community
 

+ 8 - 3
packaging/installer/install-required-packages.sh

@@ -180,10 +180,15 @@ 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 | ol | rhel | rocky | sabayon | sles | suse | ubuntu)
+      almalinux | alpine | arch | centos | clear-linux-os | debian | fedora | gentoo | manjaro | opensuse-leap | opensuse-tumbleweed | ol | rhel | rocky | sabayon | sles | suse | ubuntu)
         distribution="${x}"
-        version="${VERSION_ID}"
-        codename="${VERSION}"
+        if [ "${ID}" = "opensuse-tumbleweed" ]; then
+          version="tumbleweed"
+          codename="tumbleweed"
+        else
+          version="${VERSION_ID}"
+          codename="${VERSION}"
+        fi
         detection="${os_release_file}"
         break
         ;;

+ 16 - 4
packaging/installer/kickstart.sh

@@ -674,10 +674,22 @@ get_system_info() {
           DISTRO_COMPAT_NAME="${DISTRO}"
       else
           case "${DISTRO}" in
-          opensuse-leap) DISTRO_COMPAT_NAME="opensuse" ;;
-          cloudlinux|almalinux|rocky|rhel) DISTRO_COMPAT_NAME="centos" ;;
-          artix|manjaro|obarun) DISTRO_COMPAT_NAME="arch" ;;
-          *) DISTRO_COMPAT_NAME="unknown" ;;
+          opensuse-leap)
+              DISTRO_COMPAT_NAME="opensuse"
+              ;;
+          opensuse-tumbleweed)
+              DISTRO_COMPAT_NAME="opensuse"
+              SYSVERSION="tumbleweed"
+              ;;
+          cloudlinux|almalinux|rocky|rhel)
+              DISTRO_COMPAT_NAME="centos"
+              ;;
+          artix|manjaro|obarun)
+              DISTRO_COMPAT_NAME="arch"
+              ;;
+          *)
+              DISTRO_COMPAT_NAME="unknown"
+              ;;
           esac
       fi
 

+ 1 - 1
packaging/installer/netdata-updater.sh

@@ -732,7 +732,7 @@ update_binpkg() {
     DISTRO_COMPAT_NAME="${DISTRO}"
   else
     case "${DISTRO}" in
-      opensuse-leap)
+      opensuse-leap|opensuse-tumbleweed)
         DISTRO_COMPAT_NAME="opensuse"
         ;;
       cloudlinux|almalinux|rocky|rhel)