X Tutup
Skip to content

Commit 34978bf

Browse files
estespestesp
committed
Disable criu tests in Travis CI
Temporarily disable criu tests until the 5.0.0 CI kernel issue is resolved. Also update criu to v3.13 Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
1 parent 79f4c65 commit 34978bf

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

‎.travis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ install:
5555
- if [ "$TRAVIS_GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH script/setup/install-runc ; fi
5656
- if [ "$TRAVIS_GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH script/setup/install-cni ; fi
5757
- if [ "$TRAVIS_GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH script/setup/install-critools ; fi
58-
- if [ "$TRAVIS_GOOS" = "linux" ]; then wget https://github.com/checkpoint-restore/criu/archive/v3.7.tar.gz -O /tmp/criu.tar.gz ; fi
58+
- if [ "$TRAVIS_GOOS" = "linux" ]; then wget https://github.com/checkpoint-restore/criu/archive/v3.13.tar.gz -O /tmp/criu.tar.gz ; fi
5959
- if [ "$TRAVIS_GOOS" = "linux" ]; then tar -C /tmp/ -zxf /tmp/criu.tar.gz ; fi
60-
- if [ "$TRAVIS_GOOS" = "linux" ]; then cd /tmp/criu-3.7 && sudo make install-criu ; fi
60+
- if [ "$TRAVIS_GOOS" = "linux" ]; then cd /tmp/criu-3.13 && sudo make install-criu ; fi
6161
- cd $TRAVIS_BUILD_DIR
6262

6363
before_script:
@@ -78,9 +78,9 @@ script:
7878
- if [ "$TRAVIS_GOOS" = "linux" ]; then sudo make install ; fi
7979
- if [ "$TRAVIS_GOOS" = "linux" ]; then make coverage ; fi
8080
- if [ "$TRAVIS_GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH make root-coverage ; fi
81-
- if [ "$TRAVIS_GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH make integration ; fi
81+
- if [ "$TRAVIS_GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH make integration EXTRA_TESTFLAGS=-no-criu ; fi
8282
# Run the integration suite a second time. See discussion in github.com/containerd/containerd/pull/1759
83-
- if [ "$TRAVIS_GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH TESTFLAGS_PARALLEL=1 make integration ; fi
83+
- if [ "$TRAVIS_GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH TESTFLAGS_PARALLEL=1 make integration EXTRA_TESTFLAGS=-no-criu ; fi
8484
- if [ "$TRAVIS_GOOS" = "linux" ]; then
8585
sudo PATH=$PATH containerd -log-level debug &> /tmp/containerd-cri.log &
8686
sudo ctr version ;

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ GO_GCFLAGS=$(shell \
9898
BINARIES=$(addprefix bin/,$(COMMANDS))
9999

100100
# Flags passed to `go test`
101-
TESTFLAGS ?= -v $(TESTFLAGS_RACE)
101+
TESTFLAGS ?= -v $(TESTFLAGS_RACE) $(EXTRA_TESTFLAGS)
102102
TESTFLAGS_PARALLEL ?= 8
103103

104104
.PHONY: clean all AUTHORS build binaries test integration generate protos checkprotos coverage ci check help install uninstall vendor release mandir install-man

0 commit comments

Comments
 (0)
X Tutup