From f7211d0e0d40a56a3e052e4b83dd7faa87577456 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Tue, 23 Jan 2024 17:45:11 +0100 Subject: [PATCH] Move TESTSUITE => PHPUNIT_TESTSUITE --- .../bulk_prelaunch_jobs/criteria/list_of_mdls/jobs.sh | 6 +++--- .../bulk_prelaunch_jobs/criteria/multi_database/jobs.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tracker_automations/bulk_prelaunch_jobs/criteria/list_of_mdls/jobs.sh b/tracker_automations/bulk_prelaunch_jobs/criteria/list_of_mdls/jobs.sh index 00f789e9..663171ec 100755 --- a/tracker_automations/bulk_prelaunch_jobs/criteria/list_of_mdls/jobs.sh +++ b/tracker_automations/bulk_prelaunch_jobs/criteria/list_of_mdls/jobs.sh @@ -26,8 +26,8 @@ phpunit_options="" if [[ -n ${phpunit_filter} ]]; then phpunit_options="--filter ${phpunit_filter}" fi -if [[ -n ${phpunit_suite} ]]; then - phpunit_options+=" --testsuite ${phpunit_suite}" +if [[ -n ${phpunit_testsuite} ]]; then + phpunit_options+=" --testsuite ${phpunit_testsuite}" fi phpunit_options="${phpunit_options:-complete}" @@ -53,7 +53,7 @@ if [[ "${jobtype}" == "all" ]] || [[ "${jobtype}" == "phpunit" ]]; then -p DATABASE=sqlsrv \ -p PHPVERSION=${php_version} \ -p TAGS=${phpunit_filter} \ - -p TESTSUITE=${phpunit_suite} \ + -p PHPUNIT_TESTSUITE=${phpunit_testsuite} \ -p RUNNERVERSION=${runner} \ -w >> "${resultfile}.jenkinscli" < /dev/null fi diff --git a/tracker_automations/bulk_prelaunch_jobs/criteria/multi_database/jobs.sh b/tracker_automations/bulk_prelaunch_jobs/criteria/multi_database/jobs.sh index a534e0cb..e4ad8004 100755 --- a/tracker_automations/bulk_prelaunch_jobs/criteria/multi_database/jobs.sh +++ b/tracker_automations/bulk_prelaunch_jobs/criteria/multi_database/jobs.sh @@ -52,8 +52,8 @@ if [[ $jobtype =~ ^phpunit ]]; then # Only if the job type is phpunit. if [[ -n ${phpunit_filter} ]]; then phpunit_options="--filter ${phpunit_filter}" fi - if [[ -n ${phpunit_suite} ]]; then - phpunit_options+=" --testsuite ${phpunit_suite}" + if [[ -n ${phpunit_testsuite} ]]; then + phpunit_options+=" --testsuite ${phpunit_testsuite}" fi phpunit_options="${phpunit_options:-complete}" echo "PHPUnit options: ${phpunit_options}" @@ -90,7 +90,7 @@ if [[ "${jobtype}" == "phpunit" ]]; then -p DATABASE=${dbtype} \ -p PHPVERSION=${php_version} \ -p TAGS=${phpunit_filter} \ - -p TESTSUITE=${phpunit_suite} \ + -p PHPUNIT_TESTSUITE=${phpunit_testsuite} \ -p RUNNERVERSION=${runner} \ -w >> "${resultfile}.jenkinscli" < /dev/null done