From f288c832672c62f537bb7c757404922e214181c3 Mon Sep 17 00:00:00 2001
From: Katerina Koukiou <k.koukiou@gmail.com>
Date: Fri, 17 Jan 2025 13:07:47 +0100
Subject: [PATCH] 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.
---
 Makefile | 3 ++-
 test/run | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 6cc87ef9d..646fc11ac 100644
--- 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
index 76fe861e7..e6853eafc 100755
--- 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")"