Skip to content

Commit 4b3b8cd

Browse files
romacromac
authored
Use only Gaia v11 on CI (informalsystems#3546)
* Use only Gaia v11 on CI * Increase gas multiplier for misbehaviour test * Remove last use of gaia8 * Increase timeouts when setting up consumer chain * Formatting * Enable tracing for failing test * Increase pause when waiting for consumer chain to be initialized
1 parent 7a150d7 commit 4b3b8cd

File tree

9 files changed

+131
-92
lines changed

9 files changed

+131
-92
lines changed

‎.github/workflows/integration.yaml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,7 @@ jobs:
4545
fail-fast: false
4646
matrix:
4747
chain:
48-
- package: gaia8
49-
command: gaiad
50-
account_prefix: cosmos
51-
- package: gaia9
48+
- package: gaia11
5249
command: gaiad
5350
account_prefix: cosmos
5451
- package: ibc-go-v4-simapp
@@ -252,10 +249,7 @@ jobs:
252249
fail-fast: false
253250
matrix:
254251
chain:
255-
- package: gaia8
256-
command: gaiad
257-
account_prefix: cosmos
258-
- package: gaia9
252+
- package: gaia11
259253
command: gaiad
260254
account_prefix: cosmos
261255
- package: juno
@@ -301,7 +295,7 @@ jobs:
301295
fail-fast: false
302296
matrix:
303297
chain:
304-
- package: .#gaia8 .#stride-no-admin
298+
- package: .#gaia11 .#stride-no-admin
305299
command: gaiad,strided
306300
account_prefix: cosmos,stride
307301
steps:
@@ -388,7 +382,7 @@ jobs:
388382
fail-fast: false
389383
matrix:
390384
chain:
391-
- package: gaia9
385+
- package: gaia11
392386
command: gaiad
393387
account_prefix: cosmos
394388
steps:
@@ -457,14 +451,14 @@ jobs:
457451
- name: Install cargo-nextest
458452
run: curl -LsSf https://get.nexte.st/latest/linux | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin
459453
- env:
460-
RUST_LOG: info
454+
RUST_LOG: trace
461455
RUST_BACKTRACE: 1
462456
NO_COLOR_LOG: 1
463457
NEXTEST_RETRIES: 2
464458
CHAIN_COMMAND_PATHS: gaiad,${{ matrix.chain.command }}
465459
ACCOUNT_PREFIXES: cosmos,${{ matrix.chain.account_prefix }}
466460
run: |
467-
nix shell .#gaia9 .#${{ matrix.chain.package }} -c \
461+
nix shell .#gaia11 .#${{ matrix.chain.package }} -c \
468462
cargo nextest run -p ibc-integration-test --no-fail-fast --failure-output final --test-threads=2 \
469463
--features interchain-security interchain_security::
470464
@@ -507,7 +501,7 @@ jobs:
507501
CHAIN_COMMAND_PATHS: gaiad,${{ matrix.chain.command }}
508502
ACCOUNT_PREFIXES: cosmos,${{ matrix.chain.account_prefix }}
509503
run: |
510-
nix shell .#gaia9 .#${{ matrix.chain.package }} -c \
504+
nix shell .#gaia11 .#${{ matrix.chain.package }} -c \
511505
cargo nextest run -p ibc-integration-test --no-fail-fast --failure-output final --test-threads=2 \
512506
--features interchain-security,ica interchain_security::
513507
@@ -549,7 +543,7 @@ jobs:
549543
CHAIN_COMMAND_PATHS: gaiad,${{ matrix.chain.command }}
550544
ACCOUNT_PREFIXES: cosmos,${{ matrix.chain.account_prefix }}
551545
run: |
552-
nix shell .#gaia9 .#${{ matrix.chain.package }} -c \
546+
nix shell .#gaia11 .#${{ matrix.chain.package }} -c \
553547
cargo nextest run -p ibc-integration-test --no-fail-fast --failure-output final --test-threads=2 \
554548
--features interchain-security,ics31 interchain_security::
555549

‎.github/workflows/misbehaviour.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@ jobs:
4343
fail-fast: false
4444
matrix:
4545
chain:
46-
- package: gaia8
47-
command: gaiad
48-
account_prefix: cosmos
49-
- package: gaia9
46+
- package: gaia11
5047
command: gaiad
5148
account_prefix: cosmos
5249
steps:

‎.github/workflows/multi-chains.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
fail-fast: false
5959
matrix:
6060
first-package:
61-
- package: gaia9
61+
- package: gaia11
6262
command: gaiad
6363
account_prefix: cosmos
6464
- package: ibc-go-v7-simapp

‎ci/misbehaviour/config.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ gas_price = { price = 0.001, denom = 'stake' }
206206
#
207207
# Default: 1.1, ie. the gas is increased by 10%
208208
# Minimum value: 1.0
209-
gas_multiplier = 1.1
209+
gas_multiplier = 1.3
210210

211211
# Specify how many IBC messages at most to include in a single transaction.
212212
# Default: 30
@@ -309,7 +309,7 @@ store_prefix = 'ibc'
309309
default_gas = 100000
310310
max_gas = 400000
311311
gas_price = { price = 0.001, denom = 'stake' }
312-
gas_multiplier = 1.1
312+
gas_multiplier = 1.3
313313
max_msg_num = 30
314314
max_tx_size = 2097152
315315
clock_drift = '5s'

‎flake.lock

Lines changed: 72 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix

Lines changed: 43 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -7,56 +7,50 @@
77
cosmos-nix.url = github:informalsystems/cosmos.nix;
88
};
99

10-
outputs = inputs:
11-
let
12-
utils = inputs.flake-utils.lib;
13-
in
10+
outputs = inputs: let
11+
utils = inputs.flake-utils.lib;
12+
in
1413
utils.eachSystem
15-
[
16-
"aarch64-linux"
17-
"aarch64-darwin"
18-
"x86_64-darwin"
19-
"x86_64-linux"
20-
]
21-
(system:
22-
let
23-
nixpkgs = import inputs.nixpkgs {
24-
inherit system;
25-
};
14+
[
15+
"aarch64-linux"
16+
"aarch64-darwin"
17+
"x86_64-darwin"
18+
"x86_64-linux"
19+
]
20+
(system: let
21+
nixpkgs = import inputs.nixpkgs {
22+
inherit system;
23+
};
2624

27-
cosmos-nix = inputs.cosmos-nix.packages.${system};
28-
in
29-
{
30-
packages = {
31-
inherit (cosmos-nix)
32-
gaia5
33-
gaia6
34-
gaia7
35-
gaia8
36-
gaia9
37-
osmosis
38-
wasmd
39-
gaia6-ordered
40-
ibc-go-v2-simapp
41-
ibc-go-v3-simapp
42-
ibc-go-v4-simapp
43-
ibc-go-v5-simapp
44-
ibc-go-v6-simapp
45-
ibc-go-v7-simapp
46-
apalache
47-
evmos
48-
juno
49-
stride
50-
stride-no-admin
51-
stride-consumer-no-admin
52-
stride-consumer
53-
migaloo
54-
neutron
55-
;
25+
cosmos-nix = inputs.cosmos-nix.packages.${system};
26+
in {
27+
packages = {
28+
inherit
29+
(cosmos-nix)
30+
gaia6-ordered
31+
gaia11
32+
osmosis
33+
wasmd
34+
ibc-go-v2-simapp
35+
ibc-go-v3-simapp
36+
ibc-go-v4-simapp
37+
ibc-go-v5-simapp
38+
ibc-go-v6-simapp
39+
ibc-go-v7-simapp
40+
apalache
41+
evmos
42+
juno
43+
stride
44+
stride-no-admin
45+
stride-consumer-no-admin
46+
stride-consumer
47+
migaloo
48+
neutron
49+
;
5650

57-
python = nixpkgs.python3.withPackages (p: [
58-
p.toml
59-
]);
60-
};
61-
});
51+
python = nixpkgs.python3.withPackages (p: [
52+
p.toml
53+
]);
54+
};
55+
});
6256
}

‎tools/test-framework/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The `ibc-test-framework` crate provides the infrastructure and framework for wri
99
Other than Rust, the test suite assumes the `gaiad` binary is present in `$PATH`. You can install Gaia by either [building from source](https://github.com/cosmos/gaia), or load it using [Cosmos.nix](https://github.com/informalsystems/cosmos.nix/):
1010

1111
```text
12-
nix shell github:informalsystems/cosmos.nix#gaia7
12+
nix shell github:informalsystems/cosmos.nix#gaia11
1313
```
1414

1515
Alternatively, you can use `$CHAIN_COMMAND_PATH` to override with a different executable that is compatible with `gaiad`.

0 commit comments

Comments
 (0)