From b40b298997cd7b31dbf7876017c01b0db596e6bd Mon Sep 17 00:00:00 2001 From: Mamadou Date: Wed, 22 May 2024 21:31:42 +0200 Subject: [PATCH 1/2] Update static-test.sh --- scripts/static-test.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/static-test.sh b/scripts/static-test.sh index d467efe..6f7ec7f 100644 --- a/scripts/static-test.sh +++ b/scripts/static-test.sh @@ -41,18 +41,19 @@ bash /opt/config/utils/pagebuilder-compatibility-checker.sh bash /opt/config/utils/common-magento-installer.sh source /etc/environment +bin/magento deploy:mode:set developer + # copy allure config if m2 >= 2.4.6 if [ "$INPUT_OPENSEARCH" = "1" ] then echo "copying allure config from $PROJECT_PATH/magento/dev/tests/static/allure/" - ALLURE_PATH="$PROJECT_PATH/magento/dev/tests/static/allure" - cp -r $ALLURE_PATH . + $PROJECT_PATH/magento/vendor/bin/phpunit -c $PROJECT_PATH/magento/dev/tests/static/phpunit.xml.dist +else + ./vendor/bin/phpunit -c dev/tests/static/phpunit.xml.dist fi -bin/magento deploy:mode:set developer -./vendor/bin/phpunit -c dev/tests/static/phpunit.xml.dist if [ -n "$INPUT_DISABLE_MODULES" ] From 911750d6891f19c0b2fa07455f95c4bf01028600 Mon Sep 17 00:00:00 2001 From: Mamadou Date: Wed, 22 May 2024 21:50:15 +0200 Subject: [PATCH 2/2] Update static-test.sh --- scripts/static-test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/static-test.sh b/scripts/static-test.sh index 6f7ec7f..f13d161 100644 --- a/scripts/static-test.sh +++ b/scripts/static-test.sh @@ -47,7 +47,8 @@ bin/magento deploy:mode:set developer # copy allure config if m2 >= 2.4.6 if [ "$INPUT_OPENSEARCH" = "1" ] then - echo "copying allure config from $PROJECT_PATH/magento/dev/tests/static/allure/" + echo "moving to $PROJECT_PATH/magento/dev/tests/static/" + cd $PROJECT_PATH/magento/dev/tests/static/ $PROJECT_PATH/magento/vendor/bin/phpunit -c $PROJECT_PATH/magento/dev/tests/static/phpunit.xml.dist else ./vendor/bin/phpunit -c dev/tests/static/phpunit.xml.dist