From 6e15d4cab5efe3a251b245db6141e2e1b1f23065 Mon Sep 17 00:00:00 2001
From: Gari Singh <gari.r.singh@gmail.com>
Date: Sat, 15 Apr 2017 09:27:57 -0400
Subject: [PATCH] [FAB-1636] Remove references to RocksDB

We no longer remove RocksDB and most references
have already been removed.  This hopefully
completes the task

Change-Id: I96089a9de8d206b5d31827165b58dee587e0bf9a
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
---
 .travis.yml                      | 8 +-------
 core/endorser/endorser_test.yaml | 9 ---------
 devenv/setup.sh                  | 2 +-
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 983e3f954b7..31ad0cff5ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,15 +28,9 @@ install:
    git clone https://github.com/hyperledger/fabric-baseimage.git
    cd $HOME/gopath/src/github.com/$USER_NAME/$REPO_NAME/fabric-baseimage/scripts/devenv && chmod +x setup.sh && sudo ./setup.sh
    rm -rf ../../../fabric-baseimage
-   echo " Installing Rocks DB, g++ compilers & Dependencies "
+   echo " Compilers & Dependencies "
    sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-get -qq update && sudo apt-get -qq install g++-4.8 && sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90
    sudo apt-get install build-essential -y
-   sudo apt-get install -y libsnappy-dev zlib1g-dev libbz2-dev
-   cd /tmp
-   git clone --branch v4.1 --single-branch --depth 1 https://github.com/facebook/rocksdb.git
-   cd rocksdb
-   make shared_lib
-   sudo INSTALL_PATH=/usr/local make install-shared
    sudo ldconfig
 
 before_script:
diff --git a/core/endorser/endorser_test.yaml b/core/endorser/endorser_test.yaml
index f4a3fdb0cd3..b67ca46d5c8 100644
--- a/core/endorser/endorser_test.yaml
+++ b/core/endorser/endorser_test.yaml
@@ -161,15 +161,6 @@ peer:
     # networkId: test
     networkId: dev
 
-    Dockerfile:  |
-        from hyperledger/fabric-baseimage:latest
-        # Copy GOPATH src and install Peer
-        COPY src $GOPATH/src
-        RUN mkdir -p /var/hyperledger/db
-        WORKDIR $GOPATH/src/github.com/hyperledger/fabric/peer/
-        RUN CGO_CFLAGS=" " CGO_LDFLAGS="-lrocksdb -lstdc++ -lm -lz -lbz2 -lsnappy" go install && cp $GOPATH/src/github.com/hyperledger/fabric/peer/core.yaml $GOPATH/bin
-
-
     # The Address this Peer will listen on
     listenAddress: 0.0.0.0:21212
     # The Address this Peer will bind to for providing services
diff --git a/devenv/setup.sh b/devenv/setup.sh
index 2d9d406d92b..55061c52316 100755
--- a/devenv/setup.sh
+++ b/devenv/setup.sh
@@ -132,7 +132,7 @@ make clean gotools
 # Ensure permissions are set for GOPATH
 sudo chown -R ubuntu:ubuntu $GOPATH
 
-# Update limits.conf to increase nofiles for RocksDB
+# Update limits.conf to increase nofiles for LevelDB and network connections
 sudo cp /hyperledger/devenv/limits.conf /etc/security/limits.conf
 
 # Configure vagrant specific environment