From 7fdcf9e1e538ecd2036b7012df019d971038d84e Mon Sep 17 00:00:00 2001
From: latlon team <info@lat-lon.de>
Date: Mon, 20 Jan 2025 09:47:25 +0000
Subject: [PATCH] Code drop
- XPLANBOX-3614 - renamed test reports (9b44cfafb)
- XPLANBOX-3614 - fixed/added mvn params (16b9e48ee)
Co-authored-by: Lyn Elisa Goltz <goltz@lat-lon.de>
Dropped from commit: 9f1a52f1de30c7d82c77c4d32c4d8fc434afe58c
---
.../runAllIntegrationTests.sh | 13 ++++++++++---
xplan-tests/xplan-tests-soapui/runAllSoapUiTests.sh | 4 ++--
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/xplan-tests/xplan-tests-integration/runAllIntegrationTests.sh b/xplan-tests/xplan-tests-integration/runAllIntegrationTests.sh
index 38ae8969e..df198263e 100755
--- a/xplan-tests/xplan-tests-integration/runAllIntegrationTests.sh
+++ b/xplan-tests/xplan-tests-integration/runAllIntegrationTests.sh
@@ -51,7 +51,14 @@ Xvfb :0 -screen 0 1024x768x24 &
xvfbPid=$!
echo "Executing tests..."
-DISPLAY=:0 mvn integration-test -Psystem-tests -DXPLAN_VALIDATORAPI_URL_PUBLIC=$XPLAN_VALIDATOR_WEB_BASE_URL -DXPLAN_MANAGERAPI_URL_PUBLIC=$XPLAN_MANAGERAPI_URL_PUBLIC -DXPLAN_DOKUMENTEAPI_URL_PUBLIC=$XPLAN_DOKUMENTEAPI_URL_PUBLIC -DXPLAN_VALIDATOR_WEB_BASE_URL=$XPLAN_VALIDATOR_WEB_USERNAME -DXPLAN_VALIDATOR_WEB_PASSWORD=$XPLAN_VALIDATOR_WEB_PASSWORD -Dwebdriver.chrome.driver=/usr/bin/chromedriver
+DISPLAY=:0 mvn integration-test -Psystem-tests \
+ -DXPLAN_VALIDATORAPI_URL_PUBLIC=$XPLAN_VALIDATORAPI_URL_PUBLIC \
+ -DXPLAN_MANAGERAPI_URL_PUBLIC=$XPLAN_MANAGERAPI_URL_PUBLIC \
+ -DXPLAN_DOKUMENTEAPI_URL_PUBLIC=$XPLAN_DOKUMENTEAPI_URL_PUBLIC \
+ -DXPLAN_API_USERNAME=$XPLAN_API_USERNAME -DXPLAN_API_PASSWORD=$XPLAN_API_PASSWORD \
+ -DXPLAN_VALIDATOR_WEB_BASE_URL=$XPLAN_VALIDATOR_WEB_BASE_URL \
+ -DXPLAN_VALIDATOR_WEB_USERNAME=$XPLAN_VALIDATOR_WEB_USERNAME -DXPLAN_VALIDATOR_WEB_PASSWORD=$XPLAN_VALIDATOR_WEB_PASSWORD \
+ -Dwebdriver.chrome.driver=/usr/bin/chromedriver
kill -9 $xvfbPid
echo "Generating html report..."
@@ -72,8 +79,8 @@ then
XPLAN_S3_REPORT_ID="${XPLAN_S3_REPORT_ID:-`date +%y-%m-%dT%H:%m:%S`}"
XPLAN_S3_REPORT_PATH="${XPLAN_S3_REPORT_PATH:-test-reports}"
- S3_PATH_TAR="s3://$XPLAN_S3_BUCKET_ATTACHMENTS/$XPLAN_S3_REPORT_PATH/report_selenium-$XPLAN_S3_REPORT_ID.tar.gz"
- S3_PATH_PDF="s3://$XPLAN_S3_BUCKET_ATTACHMENTS/$XPLAN_S3_REPORT_PATH/report_selenium-$XPLAN_S3_REPORT_ID.pdf"
+ S3_PATH_TAR="s3://$XPLAN_S3_BUCKET_ATTACHMENTS/$XPLAN_S3_REPORT_PATH/report_integration-$XPLAN_S3_REPORT_ID.tar.gz"
+ S3_PATH_PDF="s3://$XPLAN_S3_BUCKET_ATTACHMENTS/$XPLAN_S3_REPORT_PATH/report_integration-$XPLAN_S3_REPORT_ID.pdf"
echo "Uploading $REPORT_PATH_TAR to $S3_PATH_TAR..."
aws --endpoint-url $XPLAN_S3_ENDPOINT_URL s3 cp $REPORT_PATH_TAR $S3_PATH_TAR
echo "Uploading report to $XPLAN_S3_REPORT_PATH..."
diff --git a/xplan-tests/xplan-tests-soapui/runAllSoapUiTests.sh b/xplan-tests/xplan-tests-soapui/runAllSoapUiTests.sh
index e9075610f..f312c3afc 100755
--- a/xplan-tests/xplan-tests-soapui/runAllSoapUiTests.sh
+++ b/xplan-tests/xplan-tests-soapui/runAllSoapUiTests.sh
@@ -124,8 +124,8 @@ then
XPLAN_S3_REPORT_ID="${XPLAN_S3_REPORT_ID:-`date +%y-%m-%dT%H:%m:%S`}"
XPLAN_S3_REPORT_PATH="${XPLAN_S3_REPORT_PATH:-test-reports}"
- S3_PATH_TAR="s3://$XPLAN_S3_BUCKET_ATTACHMENTS/$XPLAN_S3_REPORT_PATH/report-$XPLAN_S3_REPORT_ID.tar.gz"
- S3_PATH_PDF="s3://$XPLAN_S3_BUCKET_ATTACHMENTS/$XPLAN_S3_REPORT_PATH/report-$XPLAN_S3_REPORT_ID.pdf"
+ S3_PATH_TAR="s3://$XPLAN_S3_BUCKET_ATTACHMENTS/$XPLAN_S3_REPORT_PATH/report-soapui-$XPLAN_S3_REPORT_ID.tar.gz"
+ S3_PATH_PDF="s3://$XPLAN_S3_BUCKET_ATTACHMENTS/$XPLAN_S3_REPORT_PATH/report-soapui-$XPLAN_S3_REPORT_ID.pdf"
echo "Uploading $REPORT_PATH_TAR to $S3_PATH_TAR..."
aws --endpoint-url $XPLAN_S3_ENDPOINT_URL s3 cp $REPORT_PATH_TAR $S3_PATH_TAR
echo "Uploading report to $XPLAN_S3_REPORT_PATH..."
--
GitLab