Skip to content

Commit 96ed47d

Browse files
author
Dmitry Rozhkov
authored
Merge pull request #289 from mythi/ver
ci: update tool versions
2 parents 3db440d + 062d86f commit 96ed47d

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

.travis.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ cache:
1111

1212
env:
1313
global:
14-
- RUNC_VERSION=v1.0.0-rc8
15-
- CRIO_VERSION=v1.14.6
16-
- BUILDAH_VERSION=v1.10.0
14+
- RUNC_VERSION=v1.0.0-rc10
15+
- CRIO_VERSION=v1.17.0
16+
- BUILDAH_VERSION=v1.14.0
1717
- GO111MODULE=on
1818

1919
sudo: required
@@ -32,6 +32,10 @@ before_install:
3232
- sudo cp buildah /usr/local/bin
3333
# configure buildah
3434
- sudo mkdir -p /etc/containers
35+
- sudo mkdir -p /etc/cni/net.d
36+
- sudo mkdir -p /opt/cni/bin
37+
- sed -i -e 's/build.sh/build_linux.sh/' Makefile
38+
- make install.cni.sudo
3539
- echo -e '[registries.search]\nregistries = ["docker.io"]\n\n' | sudo tee /etc/containers/registries.conf
3640
- sudo curl https://raw.githubusercontent.com/kubernetes-sigs/cri-o/$CRIO_VERSION/test/policy.json -o /etc/containers/policy.json
3741
# install runc

Jenkinsfile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ pipeline {
88
environment {
99
GO111MODULE="on"
1010
REG="cloud-native-image-registry.westus.cloudapp.azure.com/"
11-
RUNC_VERSION="v1.0.0-rc8"
12-
CRIO_VERSION="v1.14.6"
13-
BUILDAH_VERSION="v1.10.0"
14-
GO_VERSION="1.13.5"
11+
RUNC_VERSION="v1.0.0-rc10"
12+
CRIO_VERSION="v1.17.0"
13+
BUILDAH_VERSION="v1.14.0"
14+
GO_VERSION="1.13.7"
1515
GO_TAR="go${GO_VERSION}.linux-amd64.tar.gz"
1616
GOROOT="/usr/local/go"
1717
GOPATH="/tmp/go"
@@ -61,6 +61,10 @@ pipeline {
6161
sh 'make buildah TAGS=""'
6262
sh "sudo cp buildah /usr/local/bin"
6363
sh "sudo mkdir -p /etc/containers"
64+
sh "sudo mkdir -p /etc/cni/net.d"
65+
sh "sudo mkdir -p /opt/cni/bin"
66+
sh "sed -i -e 's/build.sh/build_linux.sh/' Makefile"
67+
sh "make install.cni.sudo"
6468
sh '''echo '[registries.search]' > registries.conf'''
6569
sh '''echo 'registries = ["docker.io"]' >> registries.conf'''
6670
sh "sudo mv registries.conf /etc/containers/registries.conf"

0 commit comments

Comments
 (0)