From 0b0dba568d935f5e29ccf7a7376e369b5fd50f46 Mon Sep 17 00:00:00 2001 From: Amaury Chamayou Date: Wed, 11 Oct 2023 08:20:37 +0000 Subject: [PATCH 1/4] Add failing scenario to test CI is red on trace validation failure --- .../trace_validation.yml | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.azure-pipelines-templates/trace_validation.yml b/.azure-pipelines-templates/trace_validation.yml index ba2173d3fb2c..efc52716a502 100644 --- a/.azure-pipelines-templates/trace_validation.yml +++ b/.azure-pipelines-templates/trace_validation.yml @@ -9,16 +9,17 @@ steps: - script: | set -x cd tla/ - JSON=../build/replicate.ndjson ./tlc.sh Traceccfraft.tla 2>&1 - JSON=../build/election.ndjson ./tlc.sh Traceccfraft.tla 2>&1 - JSON=../build/multi_election.ndjson ./tlc.sh Traceccfraft.tla 2>&1 - JSON=../build/check_quorum.ndjson ./tlc.sh Traceccfraft.tla 2>&1 - JSON=../build/reconnect.ndjson ./tlc.sh Traceccfraft.tla 2>&1 - JSON=../build/reconnect_node.ndjson ./tlc.sh Traceccfraft.tla 2>&1 - JSON=../build/bad_network.ndjson ./tlc.sh Traceccfraft.tla 2>&1 - JSON=../build/fancy_election.1.ndjson ./tlc.sh Traceccfraft.tla 2>&1 - JSON=../build/fancy_election.2.ndjson ./tlc.sh Traceccfraft.tla 2>&1 - JSON=../build/suffix_collision.1.ndjson ./tlc.sh Traceccfraft.tla 2>&1 - JSON=../build/suffix_collision.2.ndjson ./tlc.sh Traceccfraft.tla 2>&1 - JSON=../build/suffix_collision.3.ndjson ./tlc.sh Traceccfraft.tla 2>&1 + JSON=../build/election_while_reconfiguration.ndjson ./tlc.sh Traceccfraft.tla + JSON=../build/replicate.ndjson ./tlc.sh Traceccfraft.tla + JSON=../build/election.ndjson ./tlc.sh Traceccfraft.tla + JSON=../build/multi_election.ndjson ./tlc.sh Traceccfraft.tla + JSON=../build/check_quorum.ndjson ./tlc.sh Traceccfraft.tla + JSON=../build/reconnect.ndjson ./tlc.sh Traceccfraft.tla + JSON=../build/reconnect_node.ndjson ./tlc.sh Traceccfraft.tla + JSON=../build/bad_network.ndjson ./tlc.sh Traceccfraft.tla + JSON=../build/fancy_election.1.ndjson ./tlc.sh Traceccfraft.tla + JSON=../build/fancy_election.2.ndjson ./tlc.sh Traceccfraft.tla + JSON=../build/suffix_collision.1.ndjson ./tlc.sh Traceccfraft.tla + JSON=../build/suffix_collision.2.ndjson ./tlc.sh Traceccfraft.tla + JSON=../build/suffix_collision.3.ndjson ./tlc.sh Traceccfraft.tla displayName: "Run trace validation" From df3014f13bc0f6c707d866e641d662bfae7d44ed Mon Sep 17 00:00:00 2001 From: Amaury Chamayou Date: Wed, 11 Oct 2023 09:50:59 +0000 Subject: [PATCH 2/4] rc? --- .azure-pipelines-templates/trace_validation.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.azure-pipelines-templates/trace_validation.yml b/.azure-pipelines-templates/trace_validation.yml index efc52716a502..02ff1b0c8940 100644 --- a/.azure-pipelines-templates/trace_validation.yml +++ b/.azure-pipelines-templates/trace_validation.yml @@ -10,6 +10,8 @@ steps: set -x cd tla/ JSON=../build/election_while_reconfiguration.ndjson ./tlc.sh Traceccfraft.tla + echo $? + echo "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" JSON=../build/replicate.ndjson ./tlc.sh Traceccfraft.tla JSON=../build/election.ndjson ./tlc.sh Traceccfraft.tla JSON=../build/multi_election.ndjson ./tlc.sh Traceccfraft.tla From a8f3f0cf49560f8b31ddd8fac6a29b67bd823e32 Mon Sep 17 00:00:00 2001 From: Amaury Chamayou Date: Wed, 11 Oct 2023 10:02:28 +0000 Subject: [PATCH 3/4] set -e --- .azure-pipelines-templates/trace_validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines-templates/trace_validation.yml b/.azure-pipelines-templates/trace_validation.yml index 02ff1b0c8940..37e56f4db7bc 100644 --- a/.azure-pipelines-templates/trace_validation.yml +++ b/.azure-pipelines-templates/trace_validation.yml @@ -7,7 +7,7 @@ steps: displayName: "Install TLA dependencies" - script: | - set -x + set -ex cd tla/ JSON=../build/election_while_reconfiguration.ndjson ./tlc.sh Traceccfraft.tla echo $? From 34c0dda2fb9d7fee7ff7b1b68c1d6edfb49bb353 Mon Sep 17 00:00:00 2001 From: Amaury Chamayou Date: Wed, 11 Oct 2023 10:03:11 +0000 Subject: [PATCH 4/4] add control --- .azure-pipelines-templates/trace_validation.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.azure-pipelines-templates/trace_validation.yml b/.azure-pipelines-templates/trace_validation.yml index 37e56f4db7bc..d030187d2488 100644 --- a/.azure-pipelines-templates/trace_validation.yml +++ b/.azure-pipelines-templates/trace_validation.yml @@ -6,6 +6,14 @@ steps: python3 ./tla/install_deps.py displayName: "Install TLA dependencies" + - script: | + cd tla/ + JSON=../build/election_while_reconfiguration.ndjson ./tlc.sh Traceccfraft.tla + echo $? + echo "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" + JSON=../build/replicate.ndjson ./tlc.sh Traceccfraft.tla + displayName: "Run trace validation without setting flags" + - script: | set -ex cd tla/ @@ -24,4 +32,4 @@ steps: JSON=../build/suffix_collision.1.ndjson ./tlc.sh Traceccfraft.tla JSON=../build/suffix_collision.2.ndjson ./tlc.sh Traceccfraft.tla JSON=../build/suffix_collision.3.ndjson ./tlc.sh Traceccfraft.tla - displayName: "Run trace validation" + displayName: "Run trace validation" \ No newline at end of file