@@ -642,10 +642,10 @@ def isChangeInUI(){
642642}
643643
644644def isPRMergable (){
645- return env. TESTS_PASSED ?. toBoolean() && env. UNIT_TESTS_PASSED ?. toBoolean() &&
645+ return ! params . regressions && env. TESTS_PASSED ?. toBoolean() && env. UNIT_TESTS_PASSED ?. toBoolean() &&
646646 (
647647 env. NO_UI_TESTS || (env. UI_TESTS_PASSED ?. toBoolean() && env. CYPRESSE2E_TESTS_PASSED ?. toBoolean())
648- ) && ! params . regressions
648+ )
649649}
650650
651651void singleNodeTestOnLinux (String type ,String mlVersion ){
@@ -682,6 +682,11 @@ void invokeDhsTestJob(){
682682
683683}
684684
685+ void invokeDhcceTestJob (){
686+ cleanWs deleteDirs : true , patterns : [[pattern : ' data-hub/**' , type : ' EXCLUDE' ]]
687+ build job : ' DHCCE/dhcce-test' , parameters : [string(name : ' DHF_BRANCH' , value : env. BRANCH_NAME )], propagate : false , wait : false
688+ }
689+
685690pipeline{
686691 agent none;
687692 options {
@@ -952,18 +957,28 @@ pipeline{
952957 }
953958 }
954959
955- stage(' dhs-test' ){
956- when { expression {return params. regressions} }
957- agent { label ' dhfLinuxAgent' }
958- steps{timeout(time : 1 , unit : ' HOURS' ){
959- catchError(buildResult : ' SUCCESS' , catchInterruptions : true , stageResult : ' FAILURE' ) {invokeDhsTestJob()}
960- }}
961- post {
962- failure{
960+ stage(' invoke-external-jobs' ){
961+ when {expression {return params. regressions}}
962+ parallel {
963+
964+ stage(' dhs-test' ) {
965+ agent { label ' dhfLinuxAgent' }
966+ steps { invokeDhsTestJob() }
967+ post {
968+ failure {
963969 println (" ${ STAGE_NAME} failed" )
964- sendMail Email ,' <h3>${STAGE_NAME} Failed </h3><h4><a href=${JENKINS_URL}/blue/organizations/jenkins/Datahub_CI/detail/$JOB_BASE_NAME/$BUILD_ID/tests><font color=red></h4><h4> <a href=${BUILD_URL}/console> Check Console Output Here</a></h4><h4>Please create bugs for the failed regressions and fix them</h4>' ,false ,' $BRANCH_NAME branch Failed'
965- }}
966- }
970+ sendMail Email , ' <h3>${STAGE_NAME} Failed </h3><h4><a href=${JENKINS_URL}/blue/organizations/jenkins/Datahub_CI/detail/$JOB_BASE_NAME/$BUILD_ID/tests><font color=red></h4><h4> <a href=${BUILD_URL}/console> Check Console Output Here</a></h4><h4>Please create bugs for the failed regressions and fix them</h4>' , false , ' $BRANCH_NAME branch Failed'
971+ }}}
972+
973+ stage(' dhcce-test' ) {
974+ agent { label ' dhfLinuxAgent' }
975+ steps { invokeDhcceTestJob() }
976+ post {
977+ failure {
978+ println (" ${ STAGE_NAME} failed" )
979+ sendMail Email , ' <h3>${STAGE_NAME} Failed </h3><h4><a href=${JENKINS_URL}/blue/organizations/jenkins/Datahub_CI/detail/$JOB_BASE_NAME/$BUILD_ID/tests><font color=red></h4><h4> <a href=${BUILD_URL}/console> Check Console Output Here</a></h4><h4>Please create bugs for the failed regressions and fix them</h4>' , false , ' $BRANCH_NAME branch Failed'
980+ }}}
981+ }}
967982
968983 stage(' rh7-singlenode' ){
969984 when { expression {return params. regressions} }
0 commit comments