Add Ubuntu 21.10 to CI. (#11585)
* Add Ubuntu 21.10 to CI. * Work around bugs in Docker. * Work around broken Ubuntu 21.10 Docker images.
Austin S. Hemmelgarn committed
Oct 15, 2021 at 12:22 UTC
0cb8ff16e430b7a6c476d131a48783612b5dd328
4 files changed
+23
-9
.github/workflows/build-and-install.yml
+10
-5
@@ -33,6 +33,7 @@ jobs:
33
- 'fedora:33'
34
- 'opensuse/leap:15.2'
35
- 'opensuse/leap:15.3'
36
+ - 'ubuntu:21.10'
37
- 'ubuntu:21.04'
38
- 'ubuntu:20.04'
39
- 'ubuntu:18.04'
@@ -79,6 +80,9 @@ jobs:
80
- distro: 'opensuse/leap:15.3'
81
rmjsonc: 'zypper rm -y libjson-c-devel'
82
83
+ - distro: 'ubuntu:21.10'
84
+ pre: 'rm -f /etc/apt/apt.conf.d/docker* && apt-get update'
85
+ rmjsonc: 'apt-get remove -y libjson-c-dev'
86
- distro: 'ubuntu:21.04'
87
pre: 'apt-get update'
88
rmjsonc: 'apt-get remove -y libjson-c-dev'
@@ -104,18 +108,19 @@ jobs:
108
docker build . -f .github/dockerfiles/Dockerfile.build_test -t test --build-arg BASE=${{ matrix.distro }}
109
- name: Regular build on ${{ matrix.distro }}
110
run: |
107
- docker run -w /netdata test /bin/sh -c 'autoreconf -ivf && ./configure && make -j2'
111
+ docker run --security-opt seccomp=unconfined -w /netdata test /bin/sh -c 'autoreconf -ivf && ./configure && make -j2'
112
- name: netdata-installer on ${{ matrix.distro }}, disable cloud
113
run: |
110
- docker run -w /netdata test /bin/sh -c './netdata-installer.sh --dont-wait --dont-start-it --disable-cloud'
114
+ docker run --security-opt seccomp=unconfined -w /netdata test /bin/sh -c './netdata-installer.sh --dont-wait --dont-start-it --disable-cloud'
115
- name: netdata-installer on ${{ matrix.distro }}, require cloud
116
run: |
113
- docker run -w /netdata test /bin/sh -c './netdata-installer.sh --dont-wait --dont-start-it --require-cloud'
117
+ docker run --security-opt seccomp=unconfined -w /netdata test /bin/sh -c './netdata-installer.sh --dont-wait --dont-start-it --require-cloud'
118
- name: netdata-installer on ${{ matrix.distro }}, require cloud, require ACLK-NG
119
run: |
116
- docker run -w /netdata -e NETDATA_CONFIGURE_OPTIONS='--with-aclk-ng' test /bin/sh -c './netdata-installer.sh --dont-wait --dont-start-it --require-cloud'
120
+ docker run --security-opt seccomp=unconfined -w /netdata -e NETDATA_CONFIGURE_OPTIONS='--with-aclk-ng' test \
121
+ /bin/sh -c './netdata-installer.sh --dont-wait --dont-start-it --require-cloud'
122
- name: netdata-installer on ${{ matrix.distro }}, require cloud, no JSON-C
123
if: matrix.rmjsonc != ''
124
run: |
120
- docker run -w /netdata test \
125
+ docker run --security-opt seccomp=unconfined -w /netdata test \
126
/bin/sh -c '/netdata/rmjsonc.sh && ./netdata-installer.sh --dont-wait --dont-start-it --require-cloud'
.github/workflows/packaging.yml
+5
-2
@@ -51,6 +51,9 @@ jobs:
51
- {distro: ubuntu, version: "21.04", pkgclouddistro: ubuntu/hirsute, format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64}
52
- {distro: ubuntu, version: "21.04", pkgclouddistro: ubuntu/hirsute, format: deb, base_image: ubuntu, platform: linux/arm/v7, arch: armhf}
53
- {distro: ubuntu, version: "21.04", pkgclouddistro: ubuntu/hirsute, format: deb, base_image: ubuntu, platform: linux/arm64/v8, arch: arm64}
54
+ - {distro: ubuntu, version: "21.10", pkgclouddistro: ubuntu/impish, format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64}
55
+ - {distro: ubuntu, version: "21.10", pkgclouddistro: ubuntu/impish, format: deb, base_image: ubuntu, platform: linux/arm/v7, arch: armhf}
56
+ - {distro: ubuntu, version: "21.10", pkgclouddistro: ubuntu/impish, format: deb, base_image: ubuntu, platform: linux/arm64/v8, arch: arm64}
57
- {distro: centos, version: "7", pkgclouddistro: el/7, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64}
58
- {distro: centos, version: "8", pkgclouddistro: el/8, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64}
59
- {distro: centos, version: "8", pkgclouddistro: el/8, format: rpm, base_image: centos, platform: linux/arm64/v8, arch: arm64}
@@ -127,11 +130,11 @@ jobs:
130
- name: Build Packages
131
shell: bash
132
run: |
130
- docker run -e DO_NOT_TRACK=1 -e VERSION=${{ env.pkg_version }} --platform=${{ matrix.platform }} -v $PWD:/netdata netdata/package-builders:${{ matrix.distro }}${{ matrix.version }}
133
+ docker run --security-opt seccomp=unconfined -e DO_NOT_TRACK=1 -e VERSION=${{ env.pkg_version }} --platform=${{ matrix.platform }} -v $PWD:/netdata netdata/package-builders:${{ matrix.distro }}${{ matrix.version }}
134
- name: Test Packages
135
shell: bash
136
run: |
134
- docker run -e DO_NOT_TRACK=1 -e DISTRO=${{ matrix.distro }} -e VERSION=${{ env.pkg_version }} -e DISTRO_VERSION=${{ env.version }} --platform=${{ matrix.platform }} -v $PWD:/netdata ${{ matrix.base_image }}:${{ env.version }} /netdata/.github/scripts/pkg-test.sh
137
+ docker run --security-opt seccomp=unconfined -e DO_NOT_TRACK=1 -e DISTRO=${{ matrix.distro }} -e VERSION=${{ env.pkg_version }} -e DISTRO_VERSION=${{ env.version }} --platform=${{ matrix.platform }} -v $PWD:/netdata ${{ matrix.base_image }}:${{ env.version }} /netdata/.github/scripts/pkg-test.sh
138
- name: Save Packages
139
uses: actions/upload-artifact@v2
140
with:
.github/workflows/repoconfig-packages.yml
+4
-1
@@ -22,6 +22,7 @@ jobs:
22
- {distro: ubuntu, version: "18.04", pkgclouddistro: ubuntu/bionic, format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64}
23
- {distro: ubuntu, version: "20.04", pkgclouddistro: ubuntu/focal, format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64}
24
- {distro: ubuntu, version: "21.04", pkgclouddistro: ubuntu/hirsute, format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64}
25
+ - {distro: ubuntu, version: "21.10", pkgclouddistro: ubuntu/impish, format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64}
26
- {distro: centos, version: "7", pkgclouddistro: el/7, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64}
27
- {distro: centos, version: "8", pkgclouddistro: el/8, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64}
28
- {distro: fedora, version: "33", pkgclouddistro: fedora/33, format: rpm, base_image: fedora, platform: linux/amd64, arch: amd64}
@@ -40,7 +41,9 @@ jobs:
41
- name: Build Packages
42
shell: bash
43
run: |
43
- docker run -e DO_NOT_TRACK=1 --platform ${{ matrix.platform }} -v $PWD:/netdata ${{ matrix.base_image }}:${{ matrix.version }} /netdata/packaging/repoconfig/build-${{ matrix.format }}.sh
44
+ docker run --security-opt seccomp=unconfined -e DO_NOT_TRACK=1 --platform ${{ matrix.platform }} \
45
+ -v $PWD:/netdata ${{ matrix.base_image }}:${{ matrix.version }} \
46
+ /netdata/packaging/repoconfig/build-${{ matrix.format }}.sh
47
- name: Upload Packages
48
shell: bash
49
env:
.github/workflows/updater.yml
+4
-1
@@ -37,6 +37,7 @@ jobs:
37
- 'ubuntu:18.04'
38
- 'ubuntu:20.04'
39
- 'ubuntu:21.04'
40
+ - 'ubuntu:21.10'
41
include:
42
- distro: 'alpine:3.14'
43
pre: 'apk add -U bash'
@@ -56,6 +57,8 @@ jobs:
57
pre: 'apt-get update'
58
- distro: 'ubuntu:21.04'
59
pre: 'apt-get update'
60
+ - distro: 'ubuntu:21.10'
61
+ pre: 'rm -f /etc/apt/apt.conf.d/docker* && apt-get update'
62
runs-on: ubuntu-latest
63
steps:
64
- name: Git clone repository
@@ -85,7 +88,7 @@ jobs:
88
run: |
89
echo $PRE > ./prep-cmd.sh
90
docker build . -f .github/dockerfiles/Dockerfile.build_test -t test --build-arg BASE=${{ matrix.distro }}
88
- docker run -e DO_NOT_TRACK=1 --network host -w /netdata test \
91
+ docker run --security-opt seccomp=unconfined -e DO_NOT_TRACK=1 --network host -w /netdata test \
92
/bin/sh -c '/netdata/packaging/installer/kickstart.sh --dont-wait \
93
&& /netdata/packaging/installer/netdata-updater.sh --not-running-from-cron --no-updater-self-update \
94
&& bash /netdata/.github/scripts/check-updater.sh'