From 291254b5dea894ca467e5fe75d42fd36e2c5290c Mon Sep 17 00:00:00 2001 From: Razvan Crainea Date: Fri, 24 Nov 2023 10:58:00 +0200 Subject: [PATCH] make run-all.sh use matrix.yml Avoid double provisioning by using the same config file --- matrix.yml | 2 ++ run-all.sh | 20 +++++++------------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/matrix.yml b/matrix.yml index f98e2b7..d625541 100644 --- a/matrix.yml +++ b/matrix.yml @@ -13,3 +13,5 @@ scenario: - stir-shaken - topology-hiding - uac-auth +params: + - --exclude topology-hiding/02.th-no-dialog-username diff --git a/run-all.sh b/run-all.sh index 64344aa..ac0a926 100755 --- a/run-all.sh +++ b/run-all.sh @@ -1,20 +1,14 @@ #!/bin/bash +DIR="$( dirname "${BASH_SOURCE[0]}")" +yaml_list() { + python3 -c "import yaml;print(' '.join(yaml.safe_load(open('$DIR/matrix.yml'))['$1']))" +} + # exclude tests that we know they fail for sure -PARAMS=${PARAMS:---exclude topology-hiding/02.th-no-dialog-username} +PARAMS=${PARAMS:-$(yaml_list params)} -SETS=${SETS:-startup - registration \ - auth \ - record-route \ - dialog \ - topology-hiding \ - b2b \ - uac-auth \ - stir-shaken \ - accounting \ - presence \ - permissions} +SETS=${SETS:-$(yaml_list scenario)} sipssert \ $PARAMS \