From 0bc1e1d8aa714fe6628259d21e2b9de754b4df9a Mon Sep 17 00:00:00 2001 From: Mike Brown Date: Mon, 3 May 2021 18:44:40 -0500 Subject: [PATCH 1/2] update seccomp version Signed-off-by: Mike Brown (cherry picked from commit b56527cb7ed1146a0cc5fb24140dfccdd8d7cf57) Signed-off-by: Sebastiaan van Stijn --- .github/workflows/ci.yml | 1 + .github/workflows/release.yml | 2 ++ .zuul/playbooks/containerd-build/integration-test.yaml | 2 +- script/setup/install-seccomp | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fbcb7db1bba8..efd0d6596d68 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -368,6 +368,7 @@ jobs: env: RUNC_FLAVOR: ${{ matrix.runc }} run: | + sudo apt-get install -y gperf sudo -E PATH=$PATH script/setup/install-seccomp sudo -E PATH=$PATH script/setup/install-runc sudo -E PATH=$PATH script/setup/install-cni diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fd8c836e0da4..82808cd06782 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -132,6 +132,8 @@ jobs: RUNC_FLAVOR: runc run: | if [[ "${OS}" == "linux" ]]; then + sudo apt-get update + sudo apt-get install -y gperf sudo -E PATH=$PATH script/setup/install-seccomp fi make cri-cni-release diff --git a/.zuul/playbooks/containerd-build/integration-test.yaml b/.zuul/playbooks/containerd-build/integration-test.yaml index 4afaf80a2f6f..56a431ac02ea 100644 --- a/.zuul/playbooks/containerd-build/integration-test.yaml +++ b/.zuul/playbooks/containerd-build/integration-test.yaml @@ -11,7 +11,7 @@ set -xe set -o pipefail apt-get update - apt-get install -y btrfs-tools libseccomp-dev git pkg-config lsof + apt-get install -y btrfs-tools libseccomp-dev git pkg-config lsof gperf go version chdir: '{{ zuul.project.src_dir }}' diff --git a/script/setup/install-seccomp b/script/setup/install-seccomp index 1c156d5c6324..5122d846d961 100755 --- a/script/setup/install-seccomp +++ b/script/setup/install-seccomp @@ -22,7 +22,7 @@ set -eu -o pipefail set -x -export SECCOMP_VERSION=2.3.3 +export SECCOMP_VERSION=2.5.1 export SECCOMP_PATH=$(mktemp -d) curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" | tar -xzC "$SECCOMP_PATH" --strip-components=1 ( From eb4ba99fe2e46d1833b9869de00d9eb7c9549b25 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Tue, 1 Jun 2021 22:10:10 -0400 Subject: [PATCH 2/2] Install apparmor parser for arm64 environment Signed-off-by: Davanum Srinivas (cherry picked from commit a93b5cbc2f1f6e4e4b0b5fc3eb0843e24762f1f5) Signed-off-by: Sebastiaan van Stijn --- .zuul/playbooks/containerd-build/integration-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zuul/playbooks/containerd-build/integration-test.yaml b/.zuul/playbooks/containerd-build/integration-test.yaml index 56a431ac02ea..b66ee973e242 100644 --- a/.zuul/playbooks/containerd-build/integration-test.yaml +++ b/.zuul/playbooks/containerd-build/integration-test.yaml @@ -11,7 +11,7 @@ set -xe set -o pipefail apt-get update - apt-get install -y btrfs-tools libseccomp-dev git pkg-config lsof gperf + apt-get install -y btrfs-tools libseccomp-dev git pkg-config lsof gperf apparmor go version chdir: '{{ zuul.project.src_dir }}'