diff --git a/ci-scripts/Jenkinsfile-GitLab-Docker b/ci-scripts/Jenkinsfile-GitLab-Docker index 843fd9aab4470c4d234185cf0fdcf2782005e6b4..7803482f7c67d57c17a2fb81d635f05f5e6263ce 100644 --- a/ci-scripts/Jenkinsfile-GitLab-Docker +++ b/ci-scripts/Jenkinsfile-GitLab-Docker @@ -266,7 +266,7 @@ pipeline { script { // Check status on mysql. try { - sh 'docker exec -it cicd-mysql-svr /bin/bash -c "mysqladmin -u root --password=linux ping" > archives/mysql_status.log 2>&1' + sh 'docker exec cicd-mysql-svr /bin/bash -c "mysqladmin -u root --password=linux ping" > archives/mysql_status.log 2>&1' sh 'docker inspect --format=\'STATUS: {{.State.Health.Status}}\' cicd-mysql-svr >> archives/mysql_status.log' } catch (Exception e) { sh 'echo "STATUS: KO" >> archives/mysql_status.log' diff --git a/ci-scripts/dsTestGenerateHTMLReport.py b/ci-scripts/dsTestGenerateHTMLReport.py index de9008872d474b9470bd6a0cf5a5075bb17259f6..7b0defb8968f64205b6f092406f5fd189c3bf613 100644 --- a/ci-scripts/dsTestGenerateHTMLReport.py +++ b/ci-scripts/dsTestGenerateHTMLReport.py @@ -44,10 +44,11 @@ class HtmlReport(): self.generateFooter() self.file.close() - if finalStatus: - sys.exit(0) - else: - sys.exit(-1) + try: + if finalStatus: + sys.exit(0) + except: + print("DS-TESTER testing FAILED") def generateHeader(self): # HTML Header