vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Stick to a specific version of ostree in Travis

Browse source 
When we build ostree for Travis, stick to version 2017.9 for now.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
Nalin Dahyabhai 2017-08-02 14:59:10 -04:00
parent 66d96e77e3
commit d16625a603
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -17,8 +17,10 @@ before_install:
install: install:
- make install.tools - make install.tools
- OSTREE_VERSION=v2017.9
- git clone https://github.com/ostreedev/ostree ${TRAVIS_BUILD_DIR}/ostree - git clone https://github.com/ostreedev/ostree ${TRAVIS_BUILD_DIR}/ostree
- pushd ${TRAVIS_BUILD_DIR}/ostree - pushd ${TRAVIS_BUILD_DIR}/ostree
- git checkout $OSTREE_VERSION
- ./autogen.sh --prefix=/usr/local - ./autogen.sh --prefix=/usr/local
- make all - make all
- sudo make install - sudo make install

2
Dockerfile
View file

@ -86,8 +86,6 @@ WORKDIR /go/src/github.com/kubernetes-incubator/cri-o
ADD . /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 \ RUN make test/copyimg/copyimg \
&& mkdir -p .artifacts/redis-image \ && mkdir -p .artifacts/redis-image \
&& ./test/copyimg/copyimg --import-from=docker://redis --export-to=dir:.artifacts/redis-image --signature-policy ./test/policy.json && ./test/copyimg/copyimg --import-from=docker://redis --export-to=dir:.artifacts/redis-image --signature-policy ./test/policy.json