Skip to content

Commit 313fd0d

Browse files
authored
Merge pull request #3072 from IntersectMBO/mv_conway_conway_slow
refactor(cluster): rename conway to conway_slow scripts
2 parents de00a20 + ef02cb1 commit 313fd0d

19 files changed

+9
-9
lines changed

.github/node_upgrade_pytest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if [ "$1" = "step1" ]; then
5252
fi
5353

5454
if [ "${CI_BYRON_CLUSTER:-"false"}" != "false" ]; then
55-
: "${SCRIPTS_DIRNAME:="$CLUSTER_ERA"}"
55+
: "${SCRIPTS_DIRNAME:="$CLUSTER_ERA"}_slow"
5656
else
5757
: "${SCRIPTS_DIRNAME:="${CLUSTER_ERA}_fast"}"
5858
fi

.github/regression.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ fi
8585
if [ -n "${BOOTSTRAP_DIR:-""}" ]; then
8686
: # don't touch `SCRIPTS_DIRNAME` when running on testnet
8787
elif [ "${CI_BYRON_CLUSTER:-"false"}" != "false" ]; then
88-
export SCRIPTS_DIRNAME="${SCRIPTS_DIRNAME:-"$CLUSTER_ERA"}"
88+
export SCRIPTS_DIRNAME="${SCRIPTS_DIRNAME:-"$CLUSTER_ERA"}_slow"
8989
else
9090
export SCRIPTS_DIRNAME="${SCRIPTS_DIRNAME:-"${CLUSTER_ERA}_fast"}"
9191
fi

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ init_lint:
1313
# run linters
1414
.PHONY: lint
1515
lint:
16-
pre-commit run -a
16+
pre-commit run -a --show-diff-on-failure --color=always
1717
if command -v pytype >/dev/null 2>&1; then pytype -k -j auto cardano_node_tests; fi
1818

1919

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Test execution can be configured using environment variables.
124124
125125
When running tests using the `./.github/regression.sh` script, you can also use:
126126
127-
* `CI_BYRON_CLUSTER` – start local cluster in Byron era, and progress to later eras by HFs (same effect as `SCRIPTS_DIRNAME=conway`).
127+
* `CI_BYRON_CLUSTER` – start local cluster in Byron era, and progress to later eras by HFs (same effect as `SCRIPTS_DIRNAME=conway_slow`).
128128
* `NODE_REV` – revision of `cardano-node` (default: 'master').
129129
* `DBSYNC_REV` – revision of `cardano-db-sync` (default: unset; db-sync is not used by default).
130130
* `CARDANO_CLI_REV` – revision of `cardano-cli` (default: unset; cardano-cli bundled in cardano-node repo is used by default).
@@ -138,16 +138,16 @@ For example:
138138
NUM_POOLS=6 MIXED_P2P=1 ./.github/regression.sh
139139
```
140140
141-
* Running tests on local cluster instances using 15 pytest workers, Conway cluster era, cluster scripts that start a cluster directly in Conway era, and selecting only tests without 'long' marker that also match the given `-k` pytest argument:
141+
* Running tests on local cluster instances using 15 pytest workers and selecting only tests without 'long' marker that also match the given `-k` pytest argument:
142142
143143
```sh
144-
TEST_THREADS=15 CLUSTER_ERA=conway SCRIPTS_DIRNAME=conway_fast PYTEST_ARGS="-k 'test_stake_pool_low_cost or test_reward_amount'" MARKEXPR="not long" ./.github/regression.sh
144+
TEST_THREADS=15 PYTEST_ARGS="-k 'test_stake_pool_low_cost or test_reward_amount'" MARKEXPR="not long" ./.github/regression.sh
145145
```
146146
147-
* Running tests on Shelley-qa testnet with '8.0.0' release of `cardano-node`:
147+
* Running tests on Preview testnet with '10.4.1' release of `cardano-node`:
148148
149149
```sh
150-
NODE_REV=8.0.0 BOOTSTRAP_DIR=~/tmp/shelley_qa_config/ ./.github/regression.sh
150+
NODE_REV=10.4.1 BOOTSTRAP_DIR=~/tmp/preview_config/ ./.github/regression.sh
151151
```
152152
153153
## Local usage for test development (useful only for test developers)
@@ -245,7 +245,7 @@ To restart the running cluster (e.g., after upgrading `cardano-node` and `cardan
245245
246246
**NOTE** <!-- markdownlint-disable-line MD036 -->
247247
248-
Restarting the running development cluster is useful mainly when using the "conway" start scripts (not the "conway_fast" version). It takes approximately 30 minutes for the local cluster instance to progress from Byron to Conway. Starting the local cluster using the "conway_fast" version takes less than 1 minute.
248+
Restarting the running development cluster is useful mainly when using the "conway_slow" start scripts (not the "conway_fast" version). It takes approximately 40 minutes for the local cluster instance to progress from Byron to Conway. Starting the local cluster using the "conway_fast" version takes about 1 minute.
249249
250250
---
251251

cardano_node_tests/cluster_scripts/conway/byron-params.json renamed to cardano_node_tests/cluster_scripts/conway_slow/byron-params.json

File renamed without changes.

cardano_node_tests/cluster_scripts/conway/cardano-node-bft1 renamed to cardano_node_tests/cluster_scripts/conway_slow/cardano-node-bft1

File renamed without changes.

cardano_node_tests/cluster_scripts/conway/dbsync-config.yaml renamed to cardano_node_tests/cluster_scripts/conway_slow/dbsync-config.yaml

File renamed without changes.

cardano_node_tests/cluster_scripts/conway/genesis.alonzo.spec.json renamed to cardano_node_tests/cluster_scripts/conway_slow/genesis.alonzo.spec.json

File renamed without changes.

cardano_node_tests/cluster_scripts/conway/genesis.conway.spec.json renamed to cardano_node_tests/cluster_scripts/conway_slow/genesis.conway.spec.json

File renamed without changes.

cardano_node_tests/cluster_scripts/conway/genesis.conway.spec.pv9.json renamed to cardano_node_tests/cluster_scripts/conway_slow/genesis.conway.spec.pv9.json

File renamed without changes.

0 commit comments

Comments
 (0)