github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Small fixes to our Actions CI workflow

Browse Source 
Integration tests were running with latest Go release rather than the
version used everywhere else. Also, we don't need to install protoc from
tarball and also apt-get the package for Ubuntu when used as a
dependency for criu build.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
This commit is contained in:
Phil Estes
2020-04-14 17:03:41 -04:00
parent 9441507fd2
commit 74ceb35f50
4 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
script/setup/install-cni
View File

@@ -29,10 +29,10 @@ go get -d github.com/containernetworking/plugins/...
cd "$GOPATH"/src/github.com/containernetworking/plugins
git checkout $CNI_COMMIT
FASTBUILD=true ./build.sh
mkdir -p $CNI_DIR
cp -r ./bin $CNI_DIR
mkdir -p $CNI_CONFIG_DIR
cat > $CNI_CONFIG_DIR/10-containerd-net.conflist <<EOF
sudo mkdir -p $CNI_DIR
sudo cp -r ./bin $CNI_DIR
sudo mkdir -p $CNI_CONFIG_DIR
cat <<EOF | sudo tee $CNI_CONFIG_DIR/10-containerd-net.conflist
{
"cniVersion": "0.3.1",
"name": "containerd-net",

2
script/setup/install-critools
View File

@@ -26,4 +26,4 @@ go get -d github.com/kubernetes-sigs/cri-tools/...
cd "$GOPATH"/src/github.com/kubernetes-sigs/cri-tools
git checkout $CRITEST_COMMIT
make
make install
sudo make install

7
script/setup/install-runc
View File

@@ -26,13 +26,14 @@ function install_runc() {
go get -d github.com/opencontainers/runc
cd "$GOPATH"/src/github.com/opencontainers/runc
git checkout $RUNC_COMMIT
make BUILDTAGS='seccomp apparmor selinux' runc install
make BUILDTAGS='apparmor seccomp selinux' runc
sudo make install
}
function install_crun() {
CRUN_VERSION=0.11
curl -o /usr/local/sbin/runc -L https://github.com/containers/crun/releases/download/${CRUN_VERSION}/crun-${CRUN_VERSION}-static-$(uname -m)
chmod +x /usr/local/sbin/runc
sudo curl -o /usr/local/sbin/runc -L https://github.com/containers/crun/releases/download/${CRUN_VERSION}/crun-${CRUN_VERSION}-static-$(uname -m)
sudo chmod +x /usr/local/sbin/runc
}
: ${RUNC_FLAVOR=runc}