From b53e7e65462868f157859f2a7dd7fb0f4bba7154 Mon Sep 17 00:00:00 2001
From: Boris Djalal <boris.djalal@eurecom.fr>
Date: Fri, 22 Mar 2019 11:38:05 +0100
Subject: [PATCH] Removing 2 frequencies.
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
---
ci-scripts/Jenkinsfile-gitlab | 6 ++++++
ci-scripts/xml_files/ue_band20_build.xml | 4 ++++
ci-scripts/xml_files/ue_band20_test_10mhz_orange.xml | 7 -------
ci-scripts/xml_files/ue_band20_test_10mhz_sfr.xml | 7 -------
4 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/ci-scripts/Jenkinsfile-gitlab b/ci-scripts/Jenkinsfile-gitlab
index 5fa46ddcc0e..c1675e5992c 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 eeea2e359c2..9ca1a2b2346 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 f49a26c2f77..6e5e26c4a59 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 f37df7ef42e..02b310f9c36 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>
--
GitLab