Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure latest libseccomp installation on ubuntu #1555

Draft
wants to merge 12 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ bundler_args: --without development
before_install:
- gem update --system
- gem --version
- sudo apt-get update && sudo apt-get install -y libseccomp2
- sudo systemctl restart docker
stages:
- name: e2e
if: type IN (pull_request, cron)
Expand All @@ -18,7 +16,7 @@ jobs:
name: "e2e: bionic docker with weave"
script: ./e2e/travis.sh
rvm: 2.5.4
dist: bionic
dist: xenial
env:
- CONTAINER_RUNTIME=docker
- NETWORK_PROVIDER=weave
Expand All @@ -27,7 +25,7 @@ jobs:
name: "e2e: bionic containerd with weave"
script: ./e2e/travis.sh
rvm: 2.5.4
dist: bionic
dist: xenial
env:
- CONTAINER_RUNTIME=containerd
- NETWORK_PROVIDER=weave
Expand All @@ -36,7 +34,7 @@ jobs:
name: "e2e: focal docker with weave"
script: ./e2e/travis.sh
rvm: 2.5.4
dist: bionic
dist: xenial
env:
- CONTAINER_RUNTIME=docker
- NETWORK_PROVIDER=weave
Expand All @@ -45,7 +43,7 @@ jobs:
name: "e2e: focal containerd with weave"
script: ./e2e/travis.sh
rvm: 2.5.4
dist: bionic
dist: xenial
env:
- CONTAINER_RUNTIME=containerd
- NETWORK_PROVIDER=weave
Expand All @@ -54,7 +52,7 @@ jobs:
name: "e2e: bionic docker with calico"
script: ./e2e/travis.sh
rvm: 2.5.4
dist: bionic
dist: xenial
env:
- CONTAINER_RUNTIME=docker
- NETWORK_PROVIDER=calico
Expand All @@ -63,7 +61,7 @@ jobs:
name: "e2e: focal docker with calico"
script: ./e2e/travis.sh
rvm: 2.5.4
dist: bionic
dist: xenial
env:
- CONTAINER_RUNTIME=docker
- NETWORK_PROVIDER=calico
Expand All @@ -72,7 +70,7 @@ jobs:
name: "e2e: centos7 docker with weave"
script: ./e2e/travis.sh
rvm: 2.5.4
dist: bionic
dist: xenial
env:
- CONTAINER_RUNTIME=docker
- NETWORK_PROVIDER=weave
Expand All @@ -81,7 +79,7 @@ jobs:
name: "e2e: centos7 containerd with weave"
script: ./e2e/travis.sh
rvm: 2.5.4
dist: bionic
dist: xenial
env:
- CONTAINER_RUNTIME=containerd
- NETWORK_PROVIDER=weave
Expand All @@ -90,7 +88,7 @@ jobs:
name: "e2e: centos7 docker with calico"
script: ./e2e/travis.sh
rvm: 2.5.4
dist: bionic
dist: xenial
env:
- CONTAINER_RUNTIME=docker
- NETWORK_PROVIDER=calico
Expand Down
8 changes: 7 additions & 1 deletion e2e/travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,13 @@ ifconfig
envsubst < e2e/cluster.yml > cluster.yml
envsubst < e2e/footloose.yaml > footloose.yaml

curl -L https://github.com/weaveworks/footloose/releases/download/0.6.3/footloose-0.6.3-linux-x86_64 > ./footloose
curl -sSL https://git.io/g-install | sh -s -- -y
git clone https://github.com/jakolehm/footloose.git footloose-src
pushd footloose-src/
make vendor
make bin/footloose
mv bin/footloose ../
popd
chmod +x ./footloose
./footloose create
./footloose ssh root@master0 -- 'apt-get install -y curl || yum install -y curl which openssh-clients'
Expand Down
5 changes: 4 additions & 1 deletion lib/pharos/host/ubuntu/scripts/configure-essentials.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@ set -e
# shellcheck disable=SC1091
. /usr/local/share/pharos/util.sh

export DEBIAN_FRONTEND=noninteractive

if ! dpkg -l apt-transport-https software-properties-common > /dev/null; then
export DEBIAN_FRONTEND=noninteractive
apt-get update -y
apt-get install -y apt-transport-https software-properties-common
fi

apt-get install -y seccomp

autoupgrade_file="/etc/apt/apt.conf.d/20auto-upgrades"
if [ ! -f $autoupgrade_file ]; then
touch $autoupgrade_file
Expand Down