Added Riak 2.2, updated versions of riak explorer and changed the way the riak python client gets installed

Author: jbrisbin

.travis.yml

@@ -5,7 +5,7 @@ services:
 
 before_script:
   - gem install asciibuild
-  - '[ "false" == "$TRAVIS_PULL_REQUEST" ] && docker login -u $DOCKER_USER -p $DOCKER_PASSWORD' 
+  - '[ "false" == "$TRAVIS_PULL_REQUEST" ] && docker login -u $DOCKER_USER -p $DOCKER_PASSWORD'
 
 script:
   - travis_retry asciibuild $ASCIIBUILD_OPTS -a travis=$TRAVIS -a skip_publish=$TRAVIS_PULL_REQUEST README.adoc
@@ -15,12 +15,15 @@ env:
     - RIAK_TS_VERSION=1.5.0
     - RIAK_20_VERSION=2.0.7
     - RIAK_21_VERSION=2.1.4
+    - RIAK_22_VERSION=2.2.0
   matrix:
     - ASCIIBUILD_OPTS="-a os_family=centos -a os_version=7 -a riak_flavor=kv -a riak_version=$RIAK_20_VERSION"
     - ASCIIBUILD_OPTS="-a os_family=centos -a os_version=7 -a riak_flavor=kv -a riak_version=$RIAK_21_VERSION"
+    - ASCIIBUILD_OPTS="-a os_family=centos -a os_version=7 -a riak_flavor=kv -a riak_version=$RIAK_22_VERSION"
     - ASCIIBUILD_OPTS="-a os_family=centos -a os_version=7 -a riak_flavor=ts -a riak_version=$RIAK_TS_VERSION"
     - ASCIIBUILD_OPTS="-a os_family=ubuntu -a os_version=14.04 -a riak_flavor=kv -a riak_version=$RIAK_20_VERSION"
-    - ASCIIBUILD_OPTS="-a os_family=ubuntu -a os_version=14.04 -a riak_flavor=kv -a riak_version=$RIAK_21_VERSION -a latest"
+    - ASCIIBUILD_OPTS="-a os_family=ubuntu -a os_version=14.04 -a riak_flavor=kv -a riak_version=$RIAK_21_VERSION"
+    - ASCIIBUILD_OPTS="-a os_family=ubuntu -a os_version=14.04 -a riak_flavor=kv -a riak_version=$RIAK_22_VERSION -a latest"
     - ASCIIBUILD_OPTS="-a os_family=ubuntu -a os_version=14.04 -a riak_flavor=ts -a riak_version=$RIAK_TS_VERSION -a latest"
     - ASCIIBUILD_OPTS="-a os_family=debian -a os_version=8 -a riak_flavor=ts -a riak_version=$RIAK_TS_VERSION"
 
@@ -31,4 +34,4 @@ deploy:
   bucket: basho-ci-logs
   local_dir: abuild
   upload-dir: $TRAVIS_REPO_SLUG/$TRAVIS_BRANCH
-  skip_cleanup: true
+  skip_cleanup: true

README.adoc

@@ -121,12 +121,15 @@ endif::riak_explorer[]
 
 ifdef::riak_client[]
 # Install the Python client
-RUN \
-  cd {{python_lib_dir}} && \
-  curl -sSLO https://pypi.python.org/packages/{{python_version}}/r/riak/riak-{{riak_client_version}}-py{{python_version}}.egg && \
-  curl -sSLO https://pypi.python.org/packages/{{python_version}}/p/protobuf/protobuf-{{protobuf_version}}-py{{python_version}}.egg && \
-  unzip -o riak-{{riak_client_version}}-py{{python_version}}.egg && \
-  unzip -o protobuf-{{protobuf_version}}-py{{python_version}}.egg
+ifdef::ubuntu,debian[]
+RUN apt-get install -y build-essential libssl-dev
+RUN apt-get install -y python-pip
+endif::[]
+ifdef::centos[]
+RUN yum groups install -y 'Development Tools'
+RUN yum install -y openssl-devel python-pip
+endif::[]
+RUN pip install --upgrade pip riak
 endif::riak_client[]
 
 # Expose default ports
@@ -282,6 +285,7 @@ STATUS=$(docker exec <% riak_pkg %> riak-admin cluster status --format csv | tai
 [ "$(echo $STATUS)" == "up up up" ]
 ----
 
+ifdef::riak_explorer[]
 == Test Bucket Type Bootstrapping
 
 This Docker image has support for automatically boostrapping bucket types and TS tables. Files in `/etc/riak/schemas/` that end in `.dt` will be read and the name of the file (minus the extension `.dt`) will be used as the bucket name and the contents of the file should contain a single line, which is the bucket type to use.
@@ -330,6 +334,7 @@ fi
 # Remove the container
 docker rm -f $SCHEMAS_CONTAINER || true
 ----
+endif::riak_explorer[]
 
 ifdef::riak_client[]
 == Test Riak Client

vars.adoc

@@ -7,14 +7,14 @@ ifeval::["{riak_flavor}" == "ts"]
 :riak_ts:
 :riak_pkg: riak-ts
 endif::[]
-:riak_version: 2.1.4
+:riak_version: 2.2.0
 :riak_tag: riak-{riak_flavor}:{riak_version}
 :riak_explorer:
-:riak_explorer_version: 1.2.3
+:riak_explorer_version: 1.4.1
 :python_version: 2.7
 :python_lib_dir: /usr/lib/python{python_version}/dist-packages
 :riak_client:
-:riak_client_version: 2.4.2
+:riak_client_version: 2.7.0
 :protobuf_version: 2.6.1
 :os_family: ubuntu
 :os_version: 14.04