From 75ac25814b87a859a6c94df26fa66996fb614167 Mon Sep 17 00:00:00 2001
From: Nick Freyaldenhoven <freyaldenhovennc@gmail.com>
Date: Tue, 27 Aug 2019 12:12:30 -0500
Subject: [PATCH 1/2] Updating jsonnet to only add web3 env where needed.

---
 .drone.jsonnet |  9 ++++++---
 .drone.yml     | 27 ---------------------------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index 87ce4402..9e9ffb7d 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -1,7 +1,10 @@
 local Image(name, image) = {
 	name: name,
 	image: "gcr.io/kosu-io/" + image,
-	pull: "always",
+	pull: "always"
+};
+
+local GethConfig() = {
 	environment: {
 		WEB3_URI: "http://kosu-geth:8545",
 		WEB3_URI_WS: "ws://kosu-geth:8546",
@@ -41,12 +44,12 @@ local KosuGeth(name) = Image(name, "kosu-test-geth:latest") {
 			"depends_on": ["clone"]
 		},
 
-		Image("npm-tests", "node-lts:latest") {
+		Image("npm-tests", "node-lts:latest") + GethConfig() {
 			"commands": [ "yarn test:ci" ],
 			"depends_on": [ "build-project" ],
 		},
 
-		Image("solidity", "node-lts:latest") {
+		Image("solidity", "node-lts:latest") + GethConfig() {
 			"commands": [ "yarn contracts:test:ci" ],
 			"depends_on": [ "build-project" ],
 		},
diff --git a/.drone.yml b/.drone.yml
index 02b20313..2d29e957 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -12,9 +12,6 @@ steps:
   image: gcr.io/kosu-io/node-lts:latest
   commands:
   - yarn prettier:ci
-  environment:
-    WEB3_URI: http://kosu-geth:8545
-    WEB3_URI_WS: ws://kosu-geth:8546
   depends_on:
   - clone
 
@@ -27,9 +24,6 @@ steps:
   - cd packages/kosu-system-contracts
   - yarn migrate:ci
   - WEB3_URI=http://go-kosu-ci-geth:8545 yarn migrate:ci
-  environment:
-    WEB3_URI: http://kosu-geth:8545
-    WEB3_URI_WS: ws://kosu-geth:8546
   depends_on:
   - clone
 
@@ -62,9 +56,6 @@ steps:
   commands:
   - cd packages/go-kosu
   - ./kosud -H ./testnet/node0 -E ws://go-kosu-ci-geth:8546
-  environment:
-    WEB3_URI: http://kosu-geth:8545
-    WEB3_URI_WS: ws://kosu-geth:8546
   depends_on:
   - build-project
 
@@ -75,9 +66,6 @@ steps:
   commands:
   - cd packages/go-kosu
   - ./kosud -H ./testnet/node1 -E ws://go-kosu-ci-geth:8546
-  environment:
-    WEB3_URI: http://kosu-geth:8545
-    WEB3_URI_WS: ws://kosu-geth:8546
   depends_on:
   - build-project
 
@@ -88,9 +76,6 @@ steps:
   commands:
   - cd packages/go-kosu
   - ./kosud -H ./testnet/node2 -E ws://go-kosu-ci-geth:8546
-  environment:
-    WEB3_URI: http://kosu-geth:8545
-    WEB3_URI_WS: ws://kosu-geth:8546
   depends_on:
   - build-project
 
@@ -101,9 +86,6 @@ steps:
   commands:
   - cd packages/go-kosu
   - ./kosud -H ./testnet/node3 -E ws://go-kosu-ci-geth:8546
-  environment:
-    WEB3_URI: http://kosu-geth:8545
-    WEB3_URI_WS: ws://kosu-geth:8546
   depends_on:
   - build-project
 
@@ -114,9 +96,6 @@ steps:
   - cd packages/go-kosu
   - export KOSU_TEST_NODES=$(pwd)/testnet/node0@kosu-node-1:26657,$(pwd)/testnet/node1@kosu-node-1:26657,$(pwd)/testnet/node2@kosu-node-1:26657,$(pwd)/testnet/node3@kosu-node-1:26657
   - make ci
-  environment:
-    WEB3_URI: http://kosu-geth:8545
-    WEB3_URI_WS: ws://kosu-geth:8546
   depends_on:
   - build-project
   - kosu-node-0
@@ -128,9 +107,6 @@ services:
 - name: kosu-geth
   pull: always
   image: gcr.io/kosu-io/kosu-test-geth:latest
-  environment:
-    WEB3_URI: http://kosu-geth:8545
-    WEB3_URI_WS: ws://kosu-geth:8546
   ports:
   - 8545
   - 8546
@@ -138,9 +114,6 @@ services:
 - name: go-kosu-ci-geth
   pull: always
   image: gcr.io/kosu-io/kosu-test-geth:latest
-  environment:
-    WEB3_URI: http://kosu-geth:8545
-    WEB3_URI_WS: ws://kosu-geth:8546
   ports:
   - 8545
   - 8546

From 95325d14bcc83824e32fb2b14fa36ed4756ed2a4 Mon Sep 17 00:00:00 2001
From: Nick Freyaldenhoven <freyaldenhovennc@gmail.com>
Date: Tue, 27 Aug 2019 12:23:58 -0500
Subject: [PATCH 2/2] Adding to one more place

---
 .drone.jsonnet | 2 +-
 .drone.yml     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index 9e9ffb7d..c932b72c 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -33,7 +33,7 @@ local KosuGeth(name) = Image(name, "kosu-test-geth:latest") {
 		 	"depends_on": ["clone"],
 		},
 
-	    Image("build-project", "node-lts:latest") {
+	    Image("build-project", "node-lts:latest") + GethConfig() {
 			"commands": [
 				"yarn",
 				"yarn setup:ci",
diff --git a/.drone.yml b/.drone.yml
index 2d29e957..6a18ca1c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -24,6 +24,9 @@ steps:
   - cd packages/kosu-system-contracts
   - yarn migrate:ci
   - WEB3_URI=http://go-kosu-ci-geth:8545 yarn migrate:ci
+  environment:
+    WEB3_URI: http://kosu-geth:8545
+    WEB3_URI_WS: ws://kosu-geth:8546
   depends_on:
   - clone