diff --git a/ci-scripts/Jenkinsfile-gitlab b/ci-scripts/Jenkinsfile-gitlab index 5fa46ddcc0e2064720e4fbaa2a5ec4ec142028f0..c1675e5992caa1c6d716f0d715499d30918f2d9f 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 eeea2e359c235d896b020704d2cc6d140a8da980..9ca1a2b2346509748444db85a4792054015cf246 100644 --- a/ci-scripts/xml_files/ue_band20_build.xml +++ b/ci-scripts/xml_files/ue_band20_build.xml @@ -21,9 +21,13 @@ --> <testCaseList> + <htmlTabRef>build-tab</htmlTabRef> + <htmlTabName>Build</htmlTabName> + <htmlTabIcon>wrench</htmlTabIcon> <TestCaseRequestedList> 090101 </TestCaseRequestedList> + <TestCaseExclusionList></TestCaseExclusionList> <testCase id="090101"> <class>Build_OAI_UE</class> 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 f49a26c2f77ad1afdc1bd95617887c22df9d7422..6e5e26c4a590cc7e53aa4cff8c387cf95b111a51 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 @@ <TestCaseRequestedList> 090101 090102 000001 090109 -090103 000001 090109 </TestCaseRequestedList> <TestCaseExclusionList>090101</TestCaseExclusionList> @@ -43,12 +42,6 @@ <Initialize_OAI_UE_args>-C 816000000 -r 50 --ue-rxgain 120 --ue-scan-carrier --no-L2-connect</Initialize_OAI_UE_args> </testCase> - <testCase id="090103"> - <class>Initialize_OAI_UE</class> - <desc>Initialize OAI UE -- sniffing Orange frequency</desc> - <Initialize_OAI_UE_args>-C 812000000 -r 50 --ue-rxgain 120 --ue-scan-carrier --no-L2-connect</Initialize_OAI_UE_args> - </testCase> - <testCase id="000001"> <class>IdleSleep</class> <desc>Sleep</desc> 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 f37df7ef42eb3afbd74d2140221d2c0ec04c6b4c..02b310f9c36acd763016bcab4c73ce0b43846a4f 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 @@ <TestCaseRequestedList> 090101 090104 000001 090109 -090105 000001 090109 </TestCaseRequestedList> <TestCaseExclusionList>090101</TestCaseExclusionList> @@ -43,12 +42,6 @@ <Initialize_OAI_UE_args>-C 806000000 -r 50 --ue-rxgain 120 --ue-scan-carrier --no-L2-connect</Initialize_OAI_UE_args> </testCase> - <testCase id="090105"> - <class>Initialize_OAI_UE</class> - <desc>Initialize OAI UE -- sniffing SFR frequency</desc> - <Initialize_OAI_UE_args>-C 802000000 -r 50 --ue-rxgain 120 --ue-scan-carrier --no-L2-connect</Initialize_OAI_UE_args> - </testCase> - <testCase id="000001"> <class>IdleSleep</class> <desc>Sleep</desc>