From 1e1d6a512fd601fa3fdf2dcf8cb5f1d1a76a5362 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: Thu, 13 Jul 2017 13:13:36 -0400
Subject: [PATCH] Build with ostree

Build using a locally-built copy of ostree in testing setups.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
---
 .travis.yml                                 |  8 ++++++++
 Dockerfile                                  | 10 ++++++++++
 Makefile                                    |  8 ++++++++
 contrib/test/crio-integration-playbook.yaml |  2 ++
 4 files changed, 28 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 9776b475..427989e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,12 +13,20 @@ services:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get -qq install btrfs-tools libdevmapper-dev libgpgme11-dev libapparmor-dev libseccomp-dev
+  - sudo apt-get -qq install autoconf automake bison e2fslibs-dev libfuse-dev libtool liblzma-dev
 
 install:
   - make install.tools
+  - git clone https://github.com/ostreedev/ostree ${TRAVIS_BUILD_DIR}/ostree
+  - pushd ${TRAVIS_BUILD_DIR}/ostree
+  -   ./autogen.sh --prefix=/usr/local
+  -   make all
+  -   sudo make install
+  - popd
 
 before_script:
   - export PATH=$HOME/gopath/bin:$PATH
+  - export LD_LIBRARY_PATH=/usr/local/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
 
 script:
   - make .gitvalidation
diff --git a/Dockerfile b/Dockerfile
index e10ba360..4ba5c430 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,17 +5,24 @@ RUN echo 'deb http://httpredir.debian.org/debian jessie-backports main' > /etc/a
 
 RUN apt-get update && apt-get install -y \
     apparmor \
+    autoconf \
+    automake \
+    bison \
     build-essential \
     curl \
+    e2fslibs-dev \
     gawk \
     iptables \
     pkg-config \
     libaio-dev \
     libcap-dev \
+    libfuse-dev \
+    libostree-dev \
     libprotobuf-dev \
     libprotobuf-c0-dev \
     libseccomp2/jessie-backports \
     libseccomp-dev/jessie-backports \
+    libtool \
     protobuf-c-compiler \
     protobuf-compiler \
     python-minimal \
@@ -25,6 +32,7 @@ RUN apt-get update && apt-get install -y \
     libdevmapper1.02.1 \
     libdevmapper-dev \
     libgpgme11-dev \
+    liblzma-dev \
     netcat \
     --no-install-recommends \
     && apt-get clean
@@ -78,6 +86,8 @@ 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
diff --git a/Makefile b/Makefile
index 25f646dd..a6d4f001 100644
--- a/Makefile
+++ b/Makefile
@@ -202,6 +202,14 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man
 		go get -u github.com/cpuguy83/go-md2man; \
 	fi
 
+.install.ostree: .gopathok
+	if ! pkg-config ostree-1 2> /dev/null ; then \
+		git clone https://github.com/ostreedev/ostree $(GOPATH)/src/github.com/ostreedev/ostree ; \
+		cd $(GOPATH)/src/github.com/ostreedev/ostree ; \
+		./autogen.sh --prefix=/usr/local; \
+		make all install; \
+	fi
+
 .PHONY: \
 	binaries \
 	clean \
diff --git a/contrib/test/crio-integration-playbook.yaml b/contrib/test/crio-integration-playbook.yaml
index b8ec108d..762677a3 100644
--- a/contrib/test/crio-integration-playbook.yaml
+++ b/contrib/test/crio-integration-playbook.yaml
@@ -39,6 +39,7 @@
       - container-selinux
       - btrfs-progs-devel
       - device-mapper-devel
+      - ostree-devel
       - glibc-devel
       - gpgme-devel
       - libassuan-devel
@@ -65,6 +66,7 @@
       - container-selinux
       - btrfs-progs-devel
       - device-mapper-devel
+      - ostree-devel
       - glibc-devel
       - gpgme-devel
       - libassuan-devel