build: ensure EngFlow priority is set properly on Trunk staging branch

Release note: none
Epic: CODESYS-84

Author: rickystewart

build/github/engflow-args.sh

@@ -15,7 +15,7 @@ ARGS="--config engflowpublic --tls_client_certificate=/home/agent/engflow.crt --
 if [[ "$GITHUB_ACTIONS_BRANCH" == staging-* ]]
 then
     ARGS="$ARGS --remote_execution_priority=8"
-elif [ "$GITHUB_ACTIONS_BRANCH" == "staging" ]
+elif [[ "$GITHUB_ACTIONS_BRANCH" == "staging" || "$GITHUB_ACTIONS_BRANCH" == trunk-merge/* ]]
 then
     ARGS="$ARGS --remote_execution_priority=6"
 fi

build/github/unit-tests.sh

@@ -10,7 +10,7 @@ set -euxo pipefail
 
 EXTRA_PARAMS=""
 
-if [ "$GITHUB_ACTIONS_BRANCH" == "staging" ]; then
+if [[ "$GITHUB_ACTIONS_BRANCH" == "staging" || "$GITHUB_ACTIONS_BRANCH" == trunk-merge/* ]]; then
   # enable up to 1 retry (2 attempts, worst-case) per test executable to report flakes but only on release branches and staging.
   EXTRA_PARAMS=" --flaky_test_attempts=2"
 fi