ci: use docker zlog/ci image in travis

Signed-off-by: Noah Watkins <[email protected]>

.travis.yml

@@ -1,56 +1,10 @@
-language: cpp
+sudo: required 
 
-compiler:
-  - gcc
-  - clang
+services:   
+  - docker
 
 before_install:
-  - sudo apt-get update
-  - pushd /tmp
-  - git clone --recursive https://github.com/noahdesu/ceph.git
-  - cd ceph
-  - git checkout origin/cls_zlog
-  - ./install-deps.sh
-  - ./autogen.sh
-  - ./configure
-  - cd src
-  - make libcls_zlog.la
-  - make libcls_zlog_client.la
-  - popd
-  - ssh-keygen -f $HOME/.ssh/id_rsa -t rsa -N ''
-  - cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
-  - chmod 600 ~/.ssh/authorized_keys
-  - sudo pip install ceph-deploy
-  - ceph-deploy install --dev master `hostname`
-  - ceph-deploy pkg --install librados-dev `hostname`
-  - sudo cp /tmp/ceph/src/.libs/libcls_zlog.so* /usr/lib/rados-classes/
-  - bash ci/micro-osd.sh /tmp/micro-ceph
-  - export CEPH_CONF=/tmp/micro-ceph/ceph.conf
-  - ceph status
-  - sudo apt-get install libprotobuf-dev protobuf-compiler
-
-install:
-  - autoreconf -ivf
-  - mkdir -p /tmp/install/rados/
-  - cp /tmp/ceph/src/cls/zlog/cls_zlog_client.h /tmp/install/rados
-  - CPPFLAGS=-I/tmp/install LDFLAGS=-L/tmp/ceph/src/.libs ./configure
-  - make
+  - docker pull zlog/ci
 
 script:
-  - cd src
-  - export LD_LIBRARY_PATH=/tmp/ceph/src/.libs:$LD_LIBRARY_PATH
-  - ./zlog-seqr --port 5678 --daemon
-  - ./test
-
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - gcc-4.8
-      - g++-4.8
-      - clang
-
-sudo: required 
-services:   
-  - docker
+  - docker run zlog/ci

README.md

@@ -1,8 +1,6 @@
 # Zlog - a distributed shared log for ceph
 
-<!--
 [![Build Status](https://travis-ci.org/noahdesu/zlog.svg)](https://travis-ci.org/noahdesu/zlog)
--->
 
 Zlog is a strongly consistent shared log designed to run on top of Ceph.
 Specifically, it is an implementation of the CORFU protocol adapted for RADOS,

docker/ci/Dockerfile

@@ -26,15 +26,6 @@ RUN mkdir /src && cd /src && \
   cd .. && \
   make clean
 
-# install zlog
-RUN cd /src && \
-  apt-get install -y libprotobuf-dev protobuf-compiler && \
-  git clone https://github.com/noahdesu/zlog.git && \
-  cd zlog && \
-  autoreconf -ivf && \
-  ./configure && \
-  make
-
 ADD micro-osd.sh /src/micro-osd.sh
 ADD entrypoint.sh /entrypoint.sh
 

docker/ci/entrypoint.sh

@@ -5,6 +5,16 @@ set -e
 mkdir /tmp/ceph
 bash /src/micro-osd.sh /tmp/ceph
 
+# install zlog. this is done in the entry point so it will
+# pull the latest zlog source each time the container is run
+cd /src
+apt-get install -y libprotobuf-dev protobuf-compiler
+git clone https://github.com/noahdesu/zlog.git
+cd zlog
+autoreconf -ivf
+./configure
+make
+
 cd /src/zlog/src
 export CEPH_CONF=/tmp/ceph/ceph.conf
 ./zlog-seqr --port 5678 --daemon