Merge branch 'channelbot-repo' into 'master'

Run integration test against channelbot repo

See merge request privategrity/integration!10

.gitlab-ci.yml

@@ -22,6 +22,7 @@ variables:
   DL_URL_FRAG: -/jobs/artifacts/master/raw/release/
   SERVER_URL: $PRIVATEGRITY_REPOS/server/$DL_URL_FRAG/server.linux64?job=build
   CLIENT_URL: $PRIVATEGRITY_REPOS/client/$DL_URL_FRAG/client.linux64?job=build
+  CHANNELBOT_URL: $PRIVATEGRITY_REPOS/channelbot/$DL_URL_FRAG/channelbot.linux64?job=build
 
 before_script:
   ##
@@ -48,6 +49,8 @@ installbinaries:
     - chmod +x bin/server
     - "curl -f -L -H \"PRIVATE-TOKEN: $PATKEY\" -o bin/client $CLIENT_URL"
     - chmod +x bin/client
+    - "curl -f -L -H \"PRIVATE-TOKEN: $PATKEY\" -o bin/channelbot $CHANNELBOT_URL"
+    - chmod +x bin/channelbot
     - echo $PWD
     - find bin/ -type f -exec file {} \;
   artifacts:

basice2e/run.sh

@@ -90,7 +90,7 @@ runclients() {
 }
 
 # Start a channelbot server
-CHANNELCMD="../bin/client channelbot -v -i 31 --nick \"#General\" --numnodes 5 -s $LASTNODE  -f blobchannel --noratchet"
+CHANNELCMD="../bin/channelbot -v -i 31 --nick \"#General\" --numnodes 5 -s $LASTNODE  -f blobchannel --noratchet"
 eval $CHANNELCMD >> $CHANNELOUT 2>&1 &
 PIDVAL=$!
 echo $PIDVAL >> results/serverpids

build.sh

+#!/bin/bash
+
+# This intended for manually running the integration tests on your own machine
+# and assumes that you've cloned the Go repos to your GOPATH and updated them
+# with Glide.
+
+pushd $GOPATH/src/gitlab.com/privategrity/client
+go generate cmd/version.go
+go build
+popd
+mv $GOPATH/src/gitlab.com/privategrity/client/client bin
+
+pushd $GOPATH/src/gitlab.com/privategrity/server
+go generate cmd/version.go
+go build
+popd
+mv $GOPATH/src/gitlab.com/privategrity/server/server bin
+
+pushd $GOPATH/src/gitlab.com/privategrity/channelbot
+go generate cmd/version.go
+go build
+popd
+mv $GOPATH/src/gitlab.com/privategrity/channelbot/channelbot bin