diff --git a/ci-scripts/Jenkinsfile-gitlab b/ci-scripts/Jenkinsfile-gitlab index 5fa46ddcc0..c1675e5992 100644 --- a/ci-scripts/Jenkinsfile-gitlab +++ b/ci-scripts/Jenkinsfile-gitlab @@ -133,6 +133,7 @@ pipeline { script { def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): Merge Conflicts -- Cannot perform CI" addGitLabMRComment comment: message + currentBuild.result = 'FAILURE' } } } @@ -283,6 +284,11 @@ pipeline { } } post { + failure { + script { + currentBuild.result = 'FAILURE' + } + } always { script { dir ('archives') { diff --git a/ci-scripts/xml_files/ue_band20_build.xml b/ci-scripts/xml_files/ue_band20_build.xml index eeea2e359c..9ca1a2b234 100644 --- a/ci-scripts/xml_files/ue_band20_build.xml +++ b/ci-scripts/xml_files/ue_band20_build.xml @@ -21,9 +21,13 @@ --> + build-tab + Build + wrench 090101 + Build_OAI_UE diff --git a/ci-scripts/xml_files/ue_band20_test_10mhz_orange.xml b/ci-scripts/xml_files/ue_band20_test_10mhz_orange.xml index f49a26c2f7..6e5e26c4a5 100644 --- a/ci-scripts/xml_files/ue_band20_test_10mhz_orange.xml +++ b/ci-scripts/xml_files/ue_band20_test_10mhz_orange.xml @@ -27,7 +27,6 @@ 090101 090102 000001 090109 -090103 000001 090109 090101 @@ -43,12 +42,6 @@ -C 816000000 -r 50 --ue-rxgain 120 --ue-scan-carrier --no-L2-connect - - Initialize_OAI_UE - Initialize OAI UE -- sniffing Orange frequency - -C 812000000 -r 50 --ue-rxgain 120 --ue-scan-carrier --no-L2-connect - - IdleSleep Sleep diff --git a/ci-scripts/xml_files/ue_band20_test_10mhz_sfr.xml b/ci-scripts/xml_files/ue_band20_test_10mhz_sfr.xml index f37df7ef42..02b310f9c3 100644 --- a/ci-scripts/xml_files/ue_band20_test_10mhz_sfr.xml +++ b/ci-scripts/xml_files/ue_band20_test_10mhz_sfr.xml @@ -27,7 +27,6 @@ 090101 090104 000001 090109 -090105 000001 090109 090101 @@ -43,12 +42,6 @@ -C 806000000 -r 50 --ue-rxgain 120 --ue-scan-carrier --no-L2-connect - - Initialize_OAI_UE - Initialize OAI UE -- sniffing SFR frequency - -C 802000000 -r 50 --ue-rxgain 120 --ue-scan-carrier --no-L2-connect - - IdleSleep Sleep