Skip to content

Commit

Permalink
feat: update default cluster era to conway
Browse files Browse the repository at this point in the history
This commit updates the default cluster era from "babbage" to "conway"
across various scripts and configuration files. The changes include
modifying the default values in regression scripts, workflow files,
test cases, and configuration utilities to reflect the new default
cluster era.
  • Loading branch information
mkoura committed Sep 2, 2024
1 parent 5b05dfe commit 295f800
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/regression.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -xeuo pipefail
nix --version
df -h .

DEFAULT_CLUSTER_ERA="babbage"
DEFAULT_CLUSTER_ERA="conway"

REPODIR="$(readlink -m "${0%/*}/..")"
cd "$REPODIR"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/regression.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ on:
type: choice
description: "Cluster era"
options:
- babbage
- conway 9
- conway 10
default: babbage
- babbage
default: conway 9
tx_era:
type: choice
description: "Tx era"
Expand Down
6 changes: 3 additions & 3 deletions cardano_node_tests/tests/test_tx_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,12 @@ def cluster_default_tx_era(

if is_era_explicit:
default_tx_era = VERSIONS.MAP[VERSIONS.DEFAULT_TX_ERA]
if cluster.tx_era != default_tx_era:
if cluster.command_era != default_tx_era:
cluster_default = cluster_nodes.get_cluster_type().get_cluster_obj(
tx_era=default_tx_era
command_era=default_tx_era
)
elif cluster.tx_era:
cluster_default = cluster_nodes.get_cluster_type().get_cluster_obj(tx_era="")
cluster_default = cluster_nodes.get_cluster_type().get_cluster_obj(command_era="")

return cluster_default

Expand Down
2 changes: 1 addition & 1 deletion cardano_node_tests/utils/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,6 @@ def _check_cardano_node_socket_path() -> None:
elif BOOTSTRAP_DIR:
SCRIPTS_DIRNAME = "testnets"
else:
SCRIPTS_DIRNAME = f"{CLUSTER_ERA or 'babbage'}_fast"
SCRIPTS_DIRNAME = f"{CLUSTER_ERA or 'conway'}_fast"

SCRIPTS_DIR = pl.Path(__file__).parent.parent / "cluster_scripts" / SCRIPTS_DIRNAME
4 changes: 2 additions & 2 deletions cardano_node_tests/utils/versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ class Versions:
BABBAGE: tp.Final[int] = 8
CONWAY: tp.Final[int] = 9

DEFAULT_CLUSTER_ERA: tp.Final[int] = 8
DEFAULT_TX_ERA: tp.Final[int] = 8
DEFAULT_CLUSTER_ERA: tp.Final[int] = 9
DEFAULT_TX_ERA: tp.Final[int] = 9
LAST_KNOWN_ERA: tp.Final[int] = 9

MAP: tp.ClassVar[tp.Dict[int, str]] = {
Expand Down

0 comments on commit 295f800

Please sign in to comment.