Merge pull request #726 from nalind/glib2-ostree

Build a fixed version of ostree in Travis
This commit is contained in:
Mrunal Patel 2017-08-03 09:49:38 -07:00 committed by GitHub
commit d4f023918c
2 changed files with 2 additions and 2 deletions

View file

@ -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

View file

@ -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