summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTasos Katsoulas <12612986+tkatsoulas@users.noreply.github.com>2023-07-17 14:54:39 +0300
committerGitHub <noreply@github.com>2023-07-17 14:54:39 +0300
commit69d6b7f0ed1416cc7241b76b6220dfcf31a1fb6a (patch)
tree19fe9b29f7c7299bf4e7d4102ca6c59b48f3d43b
parent7a70f6994494b357452b42caab6dc12a83c24a36 (diff)
Support nativa packages for openSUSE tumbleweed (#14692)
Signed-off-by: Tasos Katsoulas <tasos@netdata.cloud>
-rw-r--r--.github/data/distros.yml12
-rw-r--r--packaging/PLATFORM_SUPPORT.md17
-rwxr-xr-xpackaging/installer/install-required-packages.sh11
-rwxr-xr-xpackaging/installer/kickstart.sh20
-rwxr-xr-xpackaging/installer/netdata-updater.sh2
5 files changed, 43 insertions, 19 deletions
diff --git a/.github/data/distros.yml b/.github/data/distros.yml
index 355378f5aa..8376b1f034 100644
--- a/.github/data/distros.yml
+++ b/.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
diff --git a/packaging/PLATFORM_SUPPORT.md b/packaging/PLATFORM_SUPPORT.md
index 2236ae8468..62a6a40513 100644
--- a/packaging/PLATFORM_SUPPORT.md
+++ b/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
diff --git a/packaging/installer/install-required-packages.sh b/packaging/installer/install-required-packages.sh
index ce5ab40449..a05d7440e0 100755
--- a/packaging/installer/install-required-packages.sh
+++ b/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
;;
diff --git a/packaging/installer/kickstart.sh b/packaging/installer/kickstart.sh
index 3174ec2d85..31930f9d49 100755
--- a/packaging/installer/kickstart.sh
+++ b/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
diff --git a/packaging/installer/netdata-updater.sh b/packaging/installer/netdata-updater.sh
index e76a9c6620..8e06923e4b 100755
--- a/packaging/installer/netdata-updater.sh
+++ b/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)