From 0cb8ff16e430b7a6c476d131a48783612b5dd328 Mon Sep 17 00:00:00 2001 From: "Austin S. Hemmelgarn" Date: Fri, 15 Oct 2021 12:22:17 -0400 Subject: 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. --- .github/workflows/build-and-install.yml | 15 ++++++++++----- .github/workflows/packaging.yml | 7 +++++-- .github/workflows/repoconfig-packages.yml | 5 ++++- .github/workflows/updater.yml | 5 ++++- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-and-install.yml b/.github/workflows/build-and-install.yml index a2607e5bff..1a483e35de 100644 --- a/.github/workflows/build-and-install.yml +++ b/.github/workflows/build-and-install.yml @@ -33,6 +33,7 @@ jobs: - 'fedora:33' - 'opensuse/leap:15.2' - 'opensuse/leap:15.3' + - 'ubuntu:21.10' - 'ubuntu:21.04' - 'ubuntu:20.04' - 'ubuntu:18.04' @@ -79,6 +80,9 @@ jobs: - distro: 'opensuse/leap:15.3' rmjsonc: 'zypper rm -y libjson-c-devel' + - distro: 'ubuntu:21.10' + pre: 'rm -f /etc/apt/apt.conf.d/docker* && apt-get update' + rmjsonc: 'apt-get remove -y libjson-c-dev' - distro: 'ubuntu:21.04' pre: 'apt-get update' rmjsonc: 'apt-get remove -y libjson-c-dev' @@ -104,18 +108,19 @@ jobs: docker build . -f .github/dockerfiles/Dockerfile.build_test -t test --build-arg BASE=${{ matrix.distro }} - name: Regular build on ${{ matrix.distro }} run: | - docker run -w /netdata test /bin/sh -c 'autoreconf -ivf && ./configure && make -j2' + docker run --security-opt seccomp=unconfined -w /netdata test /bin/sh -c 'autoreconf -ivf && ./configure && make -j2' - name: netdata-installer on ${{ matrix.distro }}, disable cloud run: | - docker run -w /netdata test /bin/sh -c './netdata-installer.sh --dont-wait --dont-start-it --disable-cloud' + docker run --security-opt seccomp=unconfined -w /netdata test /bin/sh -c './netdata-installer.sh --dont-wait --dont-start-it --disable-cloud' - name: netdata-installer on ${{ matrix.distro }}, require cloud run: | - docker run -w /netdata test /bin/sh -c './netdata-installer.sh --dont-wait --dont-start-it --require-cloud' + docker run --security-opt seccomp=unconfined -w /netdata test /bin/sh -c './netdata-installer.sh --dont-wait --dont-start-it --require-cloud' - name: netdata-installer on ${{ matrix.distro }}, require cloud, require ACLK-NG run: | - 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' + docker run --security-opt seccomp=unconfined -w /netdata -e NETDATA_CONFIGURE_OPTIONS='--with-aclk-ng' test \ + /bin/sh -c './netdata-installer.sh --dont-wait --dont-start-it --require-cloud' - name: netdata-installer on ${{ matrix.distro }}, require cloud, no JSON-C if: matrix.rmjsonc != '' run: | - docker run -w /netdata test \ + docker run --security-opt seccomp=unconfined -w /netdata test \ /bin/sh -c '/netdata/rmjsonc.sh && ./netdata-installer.sh --dont-wait --dont-start-it --require-cloud' diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index 89e2533c61..9f4c609ae2 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -51,6 +51,9 @@ jobs: - {distro: ubuntu, version: "21.04", pkgclouddistro: ubuntu/hirsute, format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64} - {distro: ubuntu, version: "21.04", pkgclouddistro: ubuntu/hirsute, format: deb, base_image: ubuntu, platform: linux/arm/v7, arch: armhf} - {distro: ubuntu, version: "21.04", pkgclouddistro: ubuntu/hirsute, format: deb, base_image: ubuntu, platform: linux/arm64/v8, arch: arm64} + - {distro: ubuntu, version: "21.10", pkgclouddistro: ubuntu/impish, format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64} + - {distro: ubuntu, version: "21.10", pkgclouddistro: ubuntu/impish, format: deb, base_image: ubuntu, platform: linux/arm/v7, arch: armhf} + - {distro: ubuntu, version: "21.10", pkgclouddistro: ubuntu/impish, format: deb, base_image: ubuntu, platform: linux/arm64/v8, arch: arm64} - {distro: centos, version: "7", pkgclouddistro: el/7, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64} - {distro: centos, version: "8", pkgclouddistro: el/8, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64} - {distro: centos, version: "8", pkgclouddistro: el/8, format: rpm, base_image: centos, platform: linux/arm64/v8, arch: arm64} @@ -127,11 +130,11 @@ jobs: - name: Build Packages shell: bash run: | - 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 }} + 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 }} - name: Test Packages shell: bash run: | - 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 + 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 - name: Save Packages uses: actions/upload-artifact@v2 with: diff --git a/.github/workflows/repoconfig-packages.yml b/.github/workflows/repoconfig-packages.yml index 506613ac5b..1ef0bcf4f4 100644 --- a/.github/workflows/repoconfig-packages.yml +++ b/.github/workflows/repoconfig-packages.yml @@ -22,6 +22,7 @@ jobs: - {distro: ubuntu, version: "18.04", pkgclouddistro: ubuntu/bionic, format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64} - {distro: ubuntu, version: "20.04", pkgclouddistro: ubuntu/focal, format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64} - {distro: ubuntu, version: "21.04", pkgclouddistro: ubuntu/hirsute, format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64} + - {distro: ubuntu, version: "21.10", pkgclouddistro: ubuntu/impish, format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64} - {distro: centos, version: "7", pkgclouddistro: el/7, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64} - {distro: centos, version: "8", pkgclouddistro: el/8, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64} - {distro: fedora, version: "33", pkgclouddistro: fedora/33, format: rpm, base_image: fedora, platform: linux/amd64, arch: amd64} @@ -40,7 +41,9 @@ jobs: - name: Build Packages shell: bash run: | - 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 + docker run --security-opt seccomp=unconfined -e DO_NOT_TRACK=1 --platform ${{ matrix.platform }} \ + -v $PWD:/netdata ${{ matrix.base_image }}:${{ matrix.version }} \ + /netdata/packaging/repoconfig/build-${{ matrix.format }}.sh - name: Upload Packages shell: bash env: diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index 187ba99f2b..c990799c00 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -37,6 +37,7 @@ jobs: - 'ubuntu:18.04' - 'ubuntu:20.04' - 'ubuntu:21.04' + - 'ubuntu:21.10' include: - distro: 'alpine:3.14' pre: 'apk add -U bash' @@ -56,6 +57,8 @@ jobs: pre: 'apt-get update' - distro: 'ubuntu:21.04' pre: 'apt-get update' + - distro: 'ubuntu:21.10' + pre: 'rm -f /etc/apt/apt.conf.d/docker* && apt-get update' runs-on: ubuntu-latest steps: - name: Git clone repository @@ -85,7 +88,7 @@ jobs: run: | echo $PRE > ./prep-cmd.sh docker build . -f .github/dockerfiles/Dockerfile.build_test -t test --build-arg BASE=${{ matrix.distro }} - docker run -e DO_NOT_TRACK=1 --network host -w /netdata test \ + docker run --security-opt seccomp=unconfined -e DO_NOT_TRACK=1 --network host -w /netdata test \ /bin/sh -c '/netdata/packaging/installer/kickstart.sh --dont-wait \ && /netdata/packaging/installer/netdata-updater.sh --not-running-from-cron --no-updater-self-update \ && bash /netdata/.github/scripts/check-updater.sh' -- cgit v1.2.3