Skip to content

Commit e378d55

Browse files
alexromanovalexromanov
authored
chore: merge ci and stack configs to nodes (#1039)
1 parent 07918ec commit e378d55

21 files changed

+183
-428
lines changed

‎.github/workflows/e2e-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,4 +149,4 @@ jobs:
149149
if: ${{ !cancelled() }}
150150
run: |
151151
cd e2e-tests
152-
npx github-actions-ctrf ctrf-report.json
152+
npx github-actions-ctrf logs/ctrf-report.json

‎e2e-tests/config/substrate/ci-ci.json‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎e2e-tests/config/substrate/ci_nodes.json‎

Lines changed: 42 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"nodes_config": {
77
"nodes": {
88
"validator-1": {
9-
"host": "10.0.10.139",
10-
"port": "30621",
9+
"host": "ci-preview-validator-1-service.ci-preview.svc.cluster.local",
10+
"port": "${nodes_config[default_port]}",
1111
"aura_ss58_address": "5GHLr2zBDNPXno9XdKgh541uRSiTxnZyzFcr4jK6HUbHMpit",
1212
"pool_id": "da74fc8256d15c7ab3370a6ca28398986cb97c32e9ef66026ac61e99",
1313
"public_key": "0x03b827f4da9711bab7292e5695576a841a4d20af9a07b1ba7a230168d2a78e9df4",
@@ -23,8 +23,8 @@
2323
}
2424
},
2525
"validator-2": {
26-
"host": "10.0.10.139",
27-
"port": "30622",
26+
"host": "ci-preview-validator-2-service.ci-preview.svc.cluster.local",
27+
"port": "${nodes_config[default_port]}",
2828
"aura_ss58_address": "5DHbxU687f1Y3x8yBCWMtqSiJ5qt2yrxQPXNXZNNDaFtmXKv",
2929
"pool_id": "eaed153a8b046770cfd094ee72d080ea682188e63ac11937e3f7f827",
3030
"public_key": "0x02ef5bcd94d54a18ad199559782cd72ac3ccd850976aaaafbca8f9d2625afbf7c4",
@@ -40,8 +40,8 @@
4040
}
4141
},
4242
"validator-3": {
43-
"host": "10.0.10.139",
44-
"port": "30623",
43+
"host": "ci-preview-validator-3-service.ci-preview.svc.cluster.local",
44+
"port": "${nodes_config[default_port]}",
4545
"aura_ss58_address": "5FYtL6HccYhk6KZeFP7hNnkMaXrAwVpTHJWsfnNJcu8AM6in",
4646
"pool_id": "7dfba85597a867fffa59037df7f6adcd50e745dcceac2b48eda94b20",
4747
"public_key": "0x02f2762ab6e1a125dc03908a7b738f8023d13763f28a11d7633c6c8bc463478430",
@@ -57,8 +57,8 @@
5757
}
5858
},
5959
"validator-4": {
60-
"host": "10.0.10.139",
61-
"port": "30624",
60+
"host": "ci-preview-validator-4-service.ci-preview.svc.cluster.local",
61+
"port": "${nodes_config[default_port]}",
6262
"aura_ss58_address": "5GVpqdtqjxqUjuVKMkmh8ehSwcs2nXjpvzHqjouZXMJAyC4b",
6363
"pool_id": "2a3f5dd02da1310e081f2367412e02b72baad3e2a5045f62df2c78c5",
6464
"public_key": "0x025e19f82c5e2bac5e8869d49ff26359e442628bc5cfa38eeb5275f43d04015da8",
@@ -74,8 +74,8 @@
7474
}
7575
},
7676
"validator-5": {
77-
"host": "10.0.10.139",
78-
"port": "30625",
77+
"host": "ci-preview-validator-5-service.ci-preview.svc.cluster.local",
78+
"port": "${nodes_config[default_port]}",
7979
"aura_ss58_address": "5DsfhT7HJe6i5LYeKBzefrXijW5UgPsn2Cuyw5WMa4uEktTn",
8080
"pool_id": "ae81beee7a6c3fa13bba811f91f63ebdd7eb25dd8a62476d4996de10",
8181
"public_key": "0x03f38a062a4b372c045c1dddc4fe98a2c9cb1d6eec8bf02f973fd29b1096cd8155",
@@ -113,5 +113,36 @@
113113
"reserve": {
114114
"token_name": "PCTokenDemo"
115115
}
116-
}
116+
},
117+
"stack_config": {
118+
"ogmios_scheme": "ws",
119+
"ogmios_host": "staging-preview-services-service.staging-preview.svc.cluster.local",
120+
"ogmios_port": 1337,
121+
"tools": {
122+
"runner": {
123+
"kubernetes": {
124+
"pod": "ci-preview-validator-1",
125+
"namespace": "ci-preview"
126+
}
127+
},
128+
"cardano_cli": {
129+
"path": "cardano-cli",
130+
"runner": {
131+
"kubernetes": {
132+
"container": "cardano-node"
133+
}
134+
}
135+
},
136+
"node": {
137+
"path": "/usr/local/bin/partner-chains-node",
138+
"runner": {
139+
"workdir": "/data/e2e-tests",
140+
"copy_secrets": true,
141+
"kubernetes": {
142+
"container": "substrate-node"
143+
}
144+
}
145+
}
146+
}
147+
}
117148
}

‎e2e-tests/config/substrate/ci_stack.json‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎e2e-tests/config/substrate/devnet-ci.json‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎e2e-tests/config/substrate/devnet_nodes.json‎

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"nodes_config": {
77
"nodes": {
88
"alice": {
9-
"host": "10.0.10.58",
10-
"port": "30021",
9+
"host": "alice-service.sc.svc.cluster.local",
10+
"port": "${nodes_config[default_port]}",
1111
"aura_ss58_address": "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY",
1212
"pool_id": "17a3e09033f190cdcddd11350f095d3ae11f1a61c65731366750177a",
1313
"public_key": "0x020a1091341fe5664bfa1782d5e04779689068c916b04cb365ec3153755684d9a1",
@@ -16,8 +16,8 @@
1616
"permissioned_candidate": true
1717
},
1818
"bob": {
19-
"host": "10.0.10.58",
20-
"port": "30022",
19+
"host": "bob-service.sc.svc.cluster.local",
20+
"port": "${nodes_config[default_port]}",
2121
"aura_ss58_address": "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty",
2222
"pool_id": "dd67a558342e53c9ef9528124e44e43a34b2ae3b432aa5144ffec24d",
2323
"public_key": "0x0390084fdbf27d2b79d26a4f13f0ccd982cb755a661969143c37cbc49ef5b91f27",
@@ -26,8 +26,8 @@
2626
"permissioned_candidate": true
2727
},
2828
"charlie": {
29-
"host": "10.0.10.58",
30-
"port": "30023",
29+
"host": "charlie-service.sc.svc.cluster.local",
30+
"port": "${nodes_config[default_port]}",
3131
"aura_ss58_address": "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y",
3232
"pool_id": "f824ff53b6a71522bb9f8db18fffd2469d957a56cf00e0cb0bdc8a08",
3333
"public_key": "0x0389411795514af1627765eceffcbd002719f031604fadd7d188e2dc585b4e1afb",
@@ -36,17 +36,17 @@
3636
"permissioned_candidate": true
3737
},
3838
"dave": {
39-
"host": "10.0.10.58",
40-
"port": "30024",
39+
"host": "dave-service.sc.svc.cluster.local",
40+
"port": "${nodes_config[default_port]}",
4141
"aura_ss58_address": "5DAAnrj7VHTznn2AWBemMuyBwZWs6FNFjdyVXUeYum3PTXFy",
4242
"pool_id": "2e36e13ad5665685f163e4fa3d32ccf0a333fda0a67c93cbac99f7a2",
4343
"public_key": "0x03bc9d0ca094bd5b8b3225d7651eac5d18c1c04bf8ae8f8b263eebca4e1410ed0c",
4444
"aura_public_key": "0x306721211d5404bd9da88e0204360a1a9ab8b87c66c1bc2fcdd37f3c2222cc20",
4545
"grandpa_public_key": "0x5e639b43e0052c47447dac87d6fd2b6ec50bdd4d0f614e4299c665249bbd09d9"
4646
},
4747
"eve": {
48-
"host": "10.0.10.58",
49-
"port": "30025",
48+
"host": "eve-service.sc.svc.cluster.local",
49+
"port": "${nodes_config[default_port]}",
5050
"aura_ss58_address": "5HGjWAeFDfFCWPsjFQdVV2Msvz2XtMktvgocEZcCj68kUMaw",
5151
"pool_id": "54512ccbdf3a6912bf4da983a4aa46e9c46eb0fd19a2b3f5341c5366",
5252
"public_key": "0x031d10105e323c4afce225208f71a6441ee327a65b9e646e772500c74d31f669aa",
@@ -62,8 +62,8 @@
6262
}
6363
},
6464
"ferdie": {
65-
"host": "10.0.10.58",
66-
"port": "30026",
65+
"host": "ferdie-service.sc.svc.cluster.local",
66+
"port": "${nodes_config[default_port]}",
6767
"aura_ss58_address": "5CiPPseXPECbkjWCa6MnjNokrgYjMqmKndv2rSnekmSK2DjL",
6868
"pool_id": "9ad70551d17317e44866850f9827f6464f0867e50bff5a87b1f9e3c0",
6969
"public_key": "0x0291f1217d5a04cb83312ee3d88a6e6b33284e053e6ccfc3a90339a0299d12967c",
@@ -79,8 +79,8 @@
7979
}
8080
},
8181
"greg": {
82-
"host": "10.0.10.58",
83-
"port": "30027",
82+
"host": "greg-service.sc.svc.cluster.local",
83+
"port": "${nodes_config[default_port]}",
8484
"aura_ss58_address": "5D4oNr3wasgzxt7KdoHBjnxUthfoM93kWMav63aoYmPHfkBW",
8585
"pool_id": "",
8686
"public_key": "0x02dacce90fca29ca80404d9b4e8ff3d9dabd03def6a82e412acb2ad04dd734dbfc",
@@ -89,8 +89,8 @@
8989
"permissioned_candidate": false
9090
},
9191
"henry": {
92-
"host": "10.0.10.58",
93-
"port": "30028",
92+
"host": "henry-service.sc.svc.cluster.local",
93+
"port": "${nodes_config[default_port]}",
9494
"aura_ss58_address": "5FcTxwLAQ8L23HvTa6Y6UUMBKJkYRG42Vg9wVVpZDpE2ZnTZ",
9595
"pool_id": "",
9696
"public_key": "0x0263c9cdabbef76829fe5b35f0bbf3051bd1c41b80f58b5d07c271d0dd04de2a4e",
@@ -109,5 +109,35 @@
109109
"block_duration": 6,
110110
"slots_in_epoch": 60,
111111
"token_policy_id": "a8629ed63b21472af8b18382303a2367b4707e3c2bc852f303a4612b.4655454c"
112+
},
113+
"stack_config": {
114+
"ogmios_host": "devnet-services-service",
115+
"ogmios_port": 1337,
116+
"tools": {
117+
"runner": {
118+
"kubernetes": {
119+
"pod": "dave",
120+
"namespace": "sc"
121+
}
122+
},
123+
"cardano_cli": {
124+
"path": "cardano-cli",
125+
"runner": {
126+
"kubernetes": {
127+
"container": "cardano-node"
128+
}
129+
}
130+
},
131+
"node": {
132+
"path": "/usr/local/bin/partner-chains-node",
133+
"runner": {
134+
"workdir": "/data/e2e-tests",
135+
"copy_secrets": true,
136+
"kubernetes": {
137+
"container": "substrate-node"
138+
}
139+
}
140+
}
141+
}
112142
}
113143
}

‎e2e-tests/config/substrate/devnet_stack.json‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎e2e-tests/config/substrate/local-ci.json‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)