diff --git a/clr_test/clearing-all/Dockerfile b/clr_test/clearing-all/Dockerfile index 26ba5e1d8..e52095c9a 100644 --- a/clr_test/clearing-all/Dockerfile +++ b/clr_test/clearing-all/Dockerfile @@ -23,6 +23,7 @@ RUN chmod +x $CLEARING_HOME/clearing_testing_utils/clearing-tester/*.sh RUN mkdir -p $CLEARING_HOME/files/swt/importer/in RUN mkdir -p $CLEARING_HOME/files/swt/importer/out RUN mkdir -p $CLEARING_HOME/files/swt/importer/error +RUN mkdir -p $CLEARING_HOME/files/swt/importer/sftp-in RUN mkdir -p $CLEARING_HOME/files/swt/exporter RUN mkdir -p $CLEARING_HOME/files/dbf/importer/in RUN mkdir -p $CLEARING_HOME/files/dbf/importer/out @@ -37,10 +38,6 @@ RUN mkdir -p $CLEARING_HOME/files/xml/exporter RUN mkdir -p $CLEARING_HOME_BIN/log_artifacts WORKDIR $CLEARING_HOME -RUN sed -i 's/\r$//' $CLEARING_HOME/*.sh -RUN sed -i 's/\r$//' $CLEARING_HOME/clearing_testing_utils/*.sh -RUN sed -i 's/\r$//' $CLEARING_HOME/clearing_testing_utils/clearing-checker/*.sh -RUN sed -i 's/\r$//' $CLEARING_HOME/clearing_testing_utils/clearing-converter/*.sh -RUN sed -i 's/\r$//' $CLEARING_HOME/clearing_testing_utils/clearing-tester/*.sh +RUN find . -name "*.sh" | xargs sed -i 's/\r$//' -ENTRYPOINT [ "./launch_and_test.sh" ] \ No newline at end of file +ENTRYPOINT [ "./launch_and_test.sh" ] diff --git a/clr_test/clearing-all/clearing_testing_utils/clearing-checker/clearing-checker.sh b/clr_test/clearing-all/clearing_testing_utils/clearing-checker/clearing-checker.sh index 48b2b0068..3317fa540 100644 --- a/clr_test/clearing-all/clearing_testing_utils/clearing-checker/clearing-checker.sh +++ b/clr_test/clearing-all/clearing_testing_utils/clearing-checker/clearing-checker.sh @@ -3,6 +3,6 @@ CLEARING_TEST_HOME=/opt/clearing/clearing_testing_utils/ cd $CLEARING_TEST_HOME/clearing-checker -CMD="java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:9992 -jar dbf-swt-checker-1.0.jar --spring.config.location=$CLEARING_TEST_HOME/clearing-checker/" +CMD="java -jar dbf-swt-checker-1.0.jar --spring.config.location=$CLEARING_TEST_HOME/clearing-checker/" $CMD >/dev/null 2>&1 & diff --git a/clr_test/clearing-all/clearing_testing_utils/clearing-converter/clearing-converter.sh b/clr_test/clearing-all/clearing_testing_utils/clearing-converter/clearing-converter.sh index 299d70142..479b88171 100644 --- a/clr_test/clearing-all/clearing_testing_utils/clearing-converter/clearing-converter.sh +++ b/clr_test/clearing-all/clearing_testing_utils/clearing-converter/clearing-converter.sh @@ -3,7 +3,7 @@ CLEARING_TEST_HOME=/opt/clearing/clearing_testing_utils/ cd $CLEARING_TEST_HOME/clearing-converter -CMD="java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:9991 -jar swt-dbf-converter-0.0.1.jar --spring.config.location=$CLEARING_TEST_HOME/clearing-converter/" +CMD="java -jar swt-dbf-converter-0.0.1.jar --spring.config.location=$CLEARING_TEST_HOME/clearing-converter/" $CMD >/dev/null 2>&1 & diff --git a/clr_test/clearing-all/clearing_testing_utils/clearing-converter/swt-dbf-converter-0.0.1.jar b/clr_test/clearing-all/clearing_testing_utils/clearing-converter/swt-dbf-converter-0.0.1.jar index 084e88ae6..e251810b6 100644 Binary files a/clr_test/clearing-all/clearing_testing_utils/clearing-converter/swt-dbf-converter-0.0.1.jar and b/clr_test/clearing-all/clearing_testing_utils/clearing-converter/swt-dbf-converter-0.0.1.jar differ diff --git a/clr_test/clearing-all/clearing_testing_utils/clearing-tester/clearing-tester.jar b/clr_test/clearing-all/clearing_testing_utils/clearing-tester/clearing-tester.jar index 84d1414ab..a0aa47ff9 100644 Binary files a/clr_test/clearing-all/clearing_testing_utils/clearing-tester/clearing-tester.jar and b/clr_test/clearing-all/clearing_testing_utils/clearing-tester/clearing-tester.jar differ diff --git a/clr_test/clearing-all/clearing_testing_utils/run_test_env.sh b/clr_test/clearing-all/clearing_testing_utils/run_test_env.sh index 5153cf9ca..4e643c7a3 100644 --- a/clr_test/clearing-all/clearing_testing_utils/run_test_env.sh +++ b/clr_test/clearing-all/clearing_testing_utils/run_test_env.sh @@ -5,4 +5,4 @@ cd /opt/clearing/clearing_testing_utils sh ./clearing-checker/clearing-checker.sh sh ./clearing-converter/clearing-converter.sh -echo Test finish. xit code: $? +echo Test initialization finished. xit code: $?