diff --git a/smp-docker/images/oracle/oracle-db-11.2.0.2/runOracle.sh b/smp-docker/images/oracle/oracle-db-11.2.0.2/runOracle.sh index babd0235c02aecf8235bc2e80e3c5550f6317188..7d1d945931f08cc5e89259f4b15f9692b2e71333 100644 --- a/smp-docker/images/oracle/oracle-db-11.2.0.2/runOracle.sh +++ b/smp-docker/images/oracle/oracle-db-11.2.0.2/runOracle.sh @@ -192,17 +192,19 @@ fi; # Check whether database is up and running $ORACLE_BASE/$CHECK_DB_FILE if [ $? -eq 0 ]; then + #!!! Do not remove |& tee /u01/status/database.status to indicate database is ready in the status file echo "#########################" - echo "DATABASE IS READY TO USE!" + echo "DATABASE IS READY TO USE!" |& tee /u01/status/database.status echo "#########################" # Execute custom provided startup scripts runUserScripts $ORACLE_BASE/scripts/startup else + #!! Do not remove |& tee /u01/status/database.status to indicate database is ready in the status file echo "#####################################" echo "########### E R R O R ###############" - echo "DATABASE SETUP WAS NOT SUCCESSFUL!" + echo "DATABASE SETUP WAS NOT SUCCESSFUL!" |& tee /u01/status/database.status echo "Please check output for further info!" echo "########### E R R O R ###############" echo "#####################################" diff --git a/smp-docker/images/oracle/oracle-db-19.3.0/runOracle.sh b/smp-docker/images/oracle/oracle-db-19.3.0/runOracle.sh index 2a5bcc29089cb53e684c305da322f6720c3ded19..b15047089ebe6f3f7003c648d7620a278f8253fb 100755 --- a/smp-docker/images/oracle/oracle-db-19.3.0/runOracle.sh +++ b/smp-docker/images/oracle/oracle-db-19.3.0/runOracle.sh @@ -299,8 +299,9 @@ fi; status=$? if [ $status -eq 0 ]; then + #!! Do not remove |& tee /u01/status/database.status to indicate database is ready in the status file echo "#########################" - echo "DATABASE IS READY TO USE!" + echo "DATABASE IS READY TO USE!" |& tee /u01/status/database.status echo "#########################" # Execute startup script for extensions @@ -311,7 +312,8 @@ if [ $status -eq 0 ]; then else echo "#####################################" echo "########### E R R O R ###############" - echo "DATABASE SETUP WAS NOT SUCCESSFUL!" + #!! Do not remove |& tee /u01/status/database.status to indicate database is ready in the status file + echo "DATABASE SETUP WAS NOT SUCCESSFUL!" |& tee /u01/status/database.status echo "Please check output for further info!" echo "########### E R R O R ###############" echo "#####################################" diff --git a/smp-soapui-tests/groovy/oracle-4.1_integration_test_data.sql b/smp-soapui-tests/groovy/oracle-4.1_integration_test_data.sql index 873bad988c6effc4b3f03b8577e5eeb596e6a131..c3769b83f6aa3e73765bf8ec182e43fbf748aed4 100644 --- a/smp-soapui-tests/groovy/oracle-4.1_integration_test_data.sql +++ b/smp-soapui-tests/groovy/oracle-4.1_integration_test_data.sql @@ -119,7 +119,7 @@ insert into SMP_SUBRESOURCE_DEF (ID,FK_RESOURCE_DEF_ID,URL_SEGMENT, IDENTIFIER, insert into SMP_DOMAIN_RESOURCE_DEF (ID, FK_RESOURCE_DEF_ID, FK_DOMAIN_ID,CREATED_ON, LAST_UPDATED_ON ) values (1, 1, 1, sysdate, sysdate); insert into SMP_DOMAIN_RESOURCE_DEF (ID, FK_RESOURCE_DEF_ID, FK_DOMAIN_ID,CREATED_ON, LAST_UPDATED_ON ) values -(2, 2, 1, NOW(), NOW()); +(2, 2, 1, sysdate, sysdate); insert into SMP_GROUP_MEMBER (ID, FK_GROUP_ID, FK_USER_ID, MEMBERSHIP_ROLE, CREATED_ON, LAST_UPDATED_ON) values (1, 1, 2, 'ADMIN', sysdate, sysdate);