Skip to content

Commit

Permalink
update ibc integration test (#514)
Browse files Browse the repository at this point in the history
* update ibc integration test to gaia v6.0.0
* add osmosis ibc integration test to osmosisd v6.0.0
* fill seed information for stargaze-1 only
  • Loading branch information
jhernandezb authored Jan 3, 2022
1 parent b5e6918 commit 6daf789
Show file tree
Hide file tree
Showing 19 changed files with 775 additions and 237 deletions.
20 changes: 15 additions & 5 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -195,12 +195,19 @@ steps:
mount:
- '/go/pkg/mod'
- name: gaia
image: publicawesome/gaia:5.0.5
image: publicawesome/gaia:6.0.0
detach: true
commands:
- ./scripts/ci/setup-gaia.sh
environment:
GOPROXY: http://goproxy
- name: osmosis
image: publicawesome/osmosis:6.0.0
detach: true
commands:
- ./scripts/ci/setup-osmosis.sh
environment:
GOPROXY: http://goproxy
- name: stargaze
image: publicawesome/golang:1.17.0-devtooling
volumes:
Expand All @@ -219,18 +226,19 @@ steps:
chain_list:
- http://stargaze:26657
- http://gaia:26657
- http://osmosis:26657
- name: relayer
image: publicawesome/hermes:latest
image: publicawesome/hermes:0.9.0
commands:
- /bin/bash ./scripts/ci/setup-relayer.sh

- name: relayer-start
image: publicawesome/hermes:latest
image: publicawesome/hermes:0.9.0
commands:
- /bin/bash ./scripts/ci/start-relayer.sh
detach: true
- name: relayer-sender
image: publicawesome/hermes:latest
image: publicawesome/hermes:0.9.0
commands:
- /bin/bash ./scripts/ci/transfer-relayer.sh
- name: discord
Expand All @@ -252,8 +260,10 @@ trigger:
volumes:
- name: cache
temp: {}
node:
runner: integration
---
kind: signature
hmac: 7cd70baa94079edbf191d96a2c9f31d474245ec80ae0cafe621c53f2e5571f63
hmac: 10702ab67cbc4054c980fbd81d8bc7a085a28780da1a0746b07f0f6b0221b6a0

...
22 changes: 14 additions & 8 deletions cmd/starsd/cmd/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,20 @@ func InitCmd(mbm module.BasicManager, defaultNodeHome string) *cobra.Command {
config := serverCtx.Config
config.SetRoot(clientCtx.HomeDir)

seeds := []string{
"[email protected]:36656",
"[email protected]:36656",
chainID, _ := cmd.Flags().GetString(flags.FlagChainID)
if chainID == "" {
chainID = fmt.Sprintf("test-chain-%v", tmrand.Str(6))
}
seeds := []string{}

// pre-fill seeds for mainnet
if chainID == "stargaze-1" {
seeds = []string{
"[email protected]:36656",
"[email protected]:36656",
"[email protected]:26656",
"babc3f3f7804933265ec9c40ad94f4da8e9e0017@stargaze.seed.rhinostake.com:16656",
}
}

// Override default settings in config.toml
Expand All @@ -93,11 +104,6 @@ func InitCmd(mbm module.BasicManager, defaultNodeHome string) *cobra.Command {
config.StateSync.TrustPeriod = 112 * time.Hour
config.FastSync.Version = "v0"

chainID, _ := cmd.Flags().GetString(flags.FlagChainID)
if chainID == "" {
chainID = fmt.Sprintf("test-chain-%v", tmrand.Str(6))
}

// Get bip39 mnemonic
var mnemonic string
recover, _ := cmd.Flags().GetBool(FlagRecover)
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile.gaia
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM golang:1.16-alpine3.14 AS go-builder

FROM golang:1.17-alpine3.14 AS go-builder
ARG TAG

# Usage:
# docker build . --build-arg TAG=v5.0.5 -t publicawesome/gaia:5.0.5 -f docker/Dockerfile.gaia
# docker build . --build-arg TAG=v6.0.0 -t publicawesome/gaia:6.0.0 -f docker/Dockerfile.gaia

RUN set -eux; apk add --no-cache ca-certificates build-base;

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.hermes
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Used for running hermes in docker containers
#
# Usage:
# docker build . --build-arg TAG=v0.8.0-pre.1 -t publicawesome/hermes:latest -f Dockerfile.hermes
# docker build . --build-arg TAG=v0.9.0 -t publicawesome/hermes:0.9.0 -f docker/Dockerfile.hermes

FROM rust:1.52-buster AS build-env

Expand Down
28 changes: 28 additions & 0 deletions docker/Dockerfile.osmosis
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
FROM golang:1.17-alpine3.14 AS go-builder
ARG TAG

# Usage:
# docker build . --build-arg TAG=v6.0.0 -t publicawesome/osmosis:6.0.0 -f docker/Dockerfile.osmosis

RUN set -eux; apk add --no-cache ca-certificates build-base;

RUN apk add git

WORKDIR /code

RUN git clone https://github.com/osmosis-labs/osmosis
RUN cd osmosis && git checkout $TAG && CGO_ENABLED=0 LEDGER_ENABLED=false make build



# --------------------------------------------------------
FROM alpine:3.14

COPY --from=go-builder /code/osmosis/build/osmosisd /usr/bin/osmosisd
RUN apk add -U --no-cache ca-certificates
WORKDIR /home/osmosis
ENV HOME=/home/osmosis
EXPOSE 1317
EXPOSE 26656
EXPOSE 26657
EXPOSE 9090
Loading

0 comments on commit 6daf789

Please sign in to comment.