From 06a0c52532dee35088f14ecfd09dcf90b5dae3cc Mon Sep 17 00:00:00 2001 From: Razvan Crainea Date: Fri, 24 Nov 2023 12:20:29 +0200 Subject: [PATCH] github: rename matrix to environment Also drop the params, they should not be part of the matrix (cherry picked from commit af8a08d7c0a3db4b8ebc6e46269d229bc2b867c3) --- .github/workflows/run-tests.yml | 1 - environment.yml | 21 +++++++++++++++++++++ matrix.yml | 17 ----------------- run-all.sh | 2 +- 4 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 environment.yml delete mode 100644 matrix.yml diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index d25de38..98c7ce3 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -36,4 +36,3 @@ jobs: uses: ./sipssert/actions/Run_Test with: test_set: ${{ matrix.test_set }} - params: ${{ matrix.params }} diff --git a/environment.yml b/environment.yml new file mode 100644 index 0000000..3a474ca --- /dev/null +++ b/environment.yml @@ -0,0 +1,21 @@ +os: + - ubuntu-latest +test_set: + - accounting + - auth + - b2b + - dialog + - permissions + - presence + - record-route + - registration + - startup + - stir-shaken + - topology-hiding + - uac-auth +params: + - --exclude b2b/09.refer-unattended-uac-notify-fail + - --exclude b2b/10.refer-unattended-uas-notify-fail + - --exclude b2b/15.refer-unattended-uac-prov-notify-fail + - --exclude b2b/16.refer-unattended-uas-prov-notify-fail + - --exclude topology-hiding/02.th-no-dialog-username diff --git a/matrix.yml b/matrix.yml deleted file mode 100644 index 83ed138..0000000 --- a/matrix.yml +++ /dev/null @@ -1,17 +0,0 @@ -os: - - ubuntu-latest -test_set: - - accounting - - auth - - b2b - - dialog - - permissions - - presence - - record-route - - registration - - startup - - 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 b64a195..138eca2 100755 --- a/run-all.sh +++ b/run-all.sh @@ -2,7 +2,7 @@ yaml_list() { test -n "${BASH_SOURCE[0]}" && DIR="$(dirname "${BASH_SOURCE[0]}")" || DIR=. - python3 -c "import yaml;print(' '.join(yaml.safe_load(open('$DIR/matrix.yml'))['$1']))" + python3 -c "import yaml;print(' '.join(yaml.safe_load(open('$DIR/environment.yml'))['$1']))" } # exclude tests that we know they fail for sure