From d16625a60330d6811d06ca37227cf0c4cc4a8455 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Wed, 2 Aug 2017 14:59:10 -0400 Subject: [PATCH] Stick to a specific version of ostree in Travis When we build ostree for Travis, stick to version 2017.9 for now. Signed-off-by: Nalin Dahyabhai --- .travis.yml | 2 ++ Dockerfile | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 427989e6..a47da69e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,10 @@ before_install: install: - make install.tools + - OSTREE_VERSION=v2017.9 - git clone https://github.com/ostreedev/ostree ${TRAVIS_BUILD_DIR}/ostree - pushd ${TRAVIS_BUILD_DIR}/ostree + - git checkout $OSTREE_VERSION - ./autogen.sh --prefix=/usr/local - make all - sudo make install diff --git a/Dockerfile b/Dockerfile index 4ba5c430..ee1ece00 100644 --- a/Dockerfile +++ b/Dockerfile @@ -86,8 +86,6 @@ WORKDIR /go/src/github.com/kubernetes-incubator/cri-o ADD . /go/src/github.com/kubernetes-incubator/cri-o -RUN make .install.ostree - RUN make test/copyimg/copyimg \ && mkdir -p .artifacts/redis-image \ && ./test/copyimg/copyimg --import-from=docker://redis --export-to=dir:.artifacts/redis-image --signature-policy ./test/policy.json