Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing the default to add web3 env config to everything using the Image function. #238

Merged
merged 5 commits into from Aug 27, 2019
Next

Updating jsonnet to only add web3 env where needed.

  • Loading branch information
Freydal committed Aug 27, 2019
commit 75ac25814b87a859a6c94df26fa66996fb614167
@@ -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" ],
},
@@ -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,19 +107,13 @@ 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

- 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
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.