Add Ubuntu 22.10 to supported distros, CI, and package builds. (#13785)
* Add Ubuntu 22.10 to supported distros, CI, and package builds. Expected release date is 2022-10-20. * Fix handling of netcat in newer Debian and Ubuntu distros.
Austin S. Hemmelgarn committed
Oct 11, 2022 at 07:26 UTC
d91c510f0f4c0d80296939872de018c691933345
3 files changed
+16
-4
.github/data/distros.yml
+7
-2
@@ -162,20 +162,25 @@ include:
162
163
- &ubuntu
164
distro: ubuntu
165
- version: "22.04"
165
+ version: "22.10"
166
env_prep: |
167
rm -f /etc/apt/apt.conf.d/docker && apt-get update
168
jsonc_removal: |
169
apt-get remove -y libjson-c-dev
170
packages: &ubuntu_packages
171
type: deb
172
- repo_distro: ubuntu/jammy
172
+ repo_distro: ubuntu/kinetic
173
arches:
174
- amd64
175
- armhf
176
- arm64
177
test:
178
ebpf-core: true
179
+ - <<: *ubuntu
180
+ version: "22.04"
181
+ packages:
182
+ <<: *ubuntu_packages
183
+ repo_distro: ubuntu/jammy
184
- <<: *ubuntu
185
version: "20.04"
186
packages:
.github/scripts/pkg-test.sh
+7
-1
@@ -4,13 +4,19 @@ install_debian_like() {
4
# This is needed to ensure package installs don't prompt for any user input.
5
export DEBIAN_FRONTEND=noninteractive
6
7
+ if apt-cache show netcat 2>&1 | grep -q "No packages found"; then
8
+ netcat="netcat-traditional"
9
+ else
10
+ netcat="netcat"
11
+ fi
12
+
13
apt-get update
14
15
# Install Netdata
16
apt-get install -y /netdata/artifacts/netdata_"${VERSION}"*_*.deb || exit 1
17
18
# Install testing tools
13
- apt-get install -y --no-install-recommends curl netcat jq || exit 1
19
+ apt-get install -y --no-install-recommends curl "${netcat}" jq || exit 1
20
}
21
22
install_fedora_like() {
packaging/PLATFORM_SUPPORT.md
+2
-1
@@ -66,8 +66,9 @@ to work on these platforms with minimal user effort.
66
| Red Hat Enterprise Linux | 9.x | x86\_64, AArch64 | |
67
| Red Hat Enterprise Linux | 8.x | x86\_64, AArch64 | |
68
| Red Hat Enterprise Linux | 7.x | x86\_64 | |
69
+| Ubuntu | 22.10 | x86\_64, ARMv7, AArch64 | |
70
| Ubuntu | 22.04 | x86\_64, ARMv7, AArch64 | |
70
-| Ubuntu | 20.04 | x86\_64, i386, ARMv7, AArch64 | |
71
+| Ubuntu | 20.04 | x86\_64, ARMv7, AArch64 | |
72
| Ubuntu | 18.04 | x86\_64, i386, ARMv7, AArch64 | |
73
74
### Intermediate