tests: let nightly compose testing trigger two scenarios

Test scenarios against the specified compose will be expensive and other, so that we get faster test runs.
KKoukiou · Jan 17, 2025 · f288c83 · f288c83
1 parent 44157a6
commit f288c83
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -220,4 +220,5 @@ $(NODE_MODULES_TEST): package.json
 
 .PHONY: test-compose
 test-compose: bots
-	bots/tests-trigger --force "-" "${TEST_OS}/compose-${TEST_COMPOSE}"
+	bots/tests-trigger --force "-" "${TEST_OS}/compose-${TEST_COMPOSE}"/expensive
+	bots/tests-trigger --force "-" "${TEST_OS}/compose-${TEST_COMPOSE}"/other
diff --git a/test/run b/test/run
@@ -23,8 +23,8 @@ RE_EXPENSIVE='E2E'
 # every known case needs to set RUN_OPTS to something non-empty, so that we can check if we hit any branch
 case "${TEST_SCENARIO:=}" in
     *compose-*)
-        RUN_OPTS="$ALL_TESTS"; export TEST_COMPOSE="${TEST_SCENARIO#compose-}"
-        ;;
+        RUN_OPTS="$ALL_TESTS"; export TEST_COMPOSE="${TEST_SCENARIO#*compose-}"
+        ;;&
     *efi*) RUN_OPTS="$ALL_TESTS"; export TEST_FIRMWARE="efi" ;;&
     *expensive*)
         RUN_OPTS="$(echo "$ALL_TESTS" | grep -E "$RE_EXPENSIVE")"