Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Michael Black
OpenXG UE
Commits
53ecaf97
Commit
53ecaf97
authored
May 16, 2019
by
Boris Djalal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing footer and tab ref names.
Signed-off-by:
Boris Djalal
<
boris.djalal@eurecom.fr
>
parent
547bb394
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
22 deletions
+25
-22
ci-scripts/Jenkinsfile-poll-gNB-UE
ci-scripts/Jenkinsfile-poll-gNB-UE
+18
-15
ci-scripts/main.py
ci-scripts/main.py
+3
-3
ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml
ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml
+2
-2
ci-scripts/xml_files/gnb_usrp_build.xml
ci-scripts/xml_files/gnb_usrp_build.xml
+1
-1
ci-scripts/xml_files/nr_ue_usrp_build.xml
ci-scripts/xml_files/nr_ue_usrp_build.xml
+1
-1
No files found.
ci-scripts/Jenkinsfile-poll-gNB-UE
View file @
53ecaf97
...
@@ -34,6 +34,7 @@ def sendSocialMediaMessage(pipeChannel, pipeColor, pipeMessage) {
...
@@ -34,6 +34,7 @@ def sendSocialMediaMessage(pipeChannel, pipeColor, pipeMessage) {
// Location of the test XML file to be run
// Location of the test XML file to be run
def
testXMLFile
=
params
.
pythonTestXmlFile
def
testXMLFile
=
params
.
pythonTestXmlFile
def
mainPythonAllXmlFiles
=
""
def
mainPythonAllXmlFiles
=
""
def
buildStageStatus
=
true
// Name of the phone resource
// Name of the phone resource
def
ciUSRPsResource
=
params
.
USRPsResource
def
ciUSRPsResource
=
params
.
USRPsResource
...
@@ -129,21 +130,6 @@ pipeline {
...
@@ -129,21 +130,6 @@ pipeline {
eNB_CommitID
=
params
.
eNB_CommitID
eNB_CommitID
=
params
.
eNB_CommitID
}
}
echo
"eNB_CommitID = ${eNB_CommitID}"
echo
"eNB_CommitID = ${eNB_CommitID}"
// If not present picking a default XML file
if
(
params
.
pythonTestXmlFile
==
null
)
{
// picking default
testXMLFile
=
'xml_files/gnb_usrp_build.xml'
echo
"Test XML file(default): ${testXMLFile}"
mainPythonAllXmlFiles
+=
"--XMLTestFile="
+
testXMLFile
+
" "
}
else
{
String
[]
myXmlTestSuite
=
testXMLFile
.
split
(
"\\r?\\n"
)
for
(
xmlFile
in
myXmlTestSuite
)
{
if
(
fileExists
(
"ci-scripts/"
+
xmlFile
))
{
mainPythonAllXmlFiles
+=
"--XMLTestFile="
+
xmlFile
+
" "
echo
"Test XML file : ${xmlFile}"
}
}
}
// If not present picking a default Stage Name
// If not present picking a default Stage Name
if
(
params
.
pipelineTestStageName
==
null
)
{
if
(
params
.
pipelineTestStageName
==
null
)
{
// picking default
// picking default
...
@@ -193,6 +179,21 @@ pipeline {
...
@@ -193,6 +179,21 @@ pipeline {
steps
{
steps
{
script
{
script
{
dir
(
'ci-scripts'
)
{
dir
(
'ci-scripts'
)
{
// If not present picking a default XML file
if
(
params
.
pythonTestXmlFile
==
null
)
{
// picking default
testXMLFile
=
'xml_files/gnb_usrp_build.xml'
echo
"Test XML file(default): ${testXMLFile}"
mainPythonAllXmlFiles
+=
"--XMLTestFile="
+
testXMLFile
+
" "
}
else
{
String
[]
myXmlTestSuite
=
testXMLFile
.
split
(
"\\r?\\n"
)
for
(
xmlFile
in
myXmlTestSuite
)
{
if
(
fileExists
(
xmlFile
))
{
mainPythonAllXmlFiles
+=
"--XMLTestFile="
+
xmlFile
+
" "
echo
"Test XML file : ${xmlFile}"
}
}
}
withCredentials
([
withCredentials
([
[
$class
:
'UsernamePasswordMultiBinding'
,
credentialsId:
"${params.eNB_Credentials}"
,
usernameVariable:
'eNB_Username'
,
passwordVariable:
'eNB_Password'
],
[
$class
:
'UsernamePasswordMultiBinding'
,
credentialsId:
"${params.eNB_Credentials}"
,
usernameVariable:
'eNB_Username'
,
passwordVariable:
'eNB_Password'
],
[
$class
:
'UsernamePasswordMultiBinding'
,
credentialsId:
"${params.UE_Credentials}"
,
usernameVariable:
'UE_Username'
,
passwordVariable:
'UE_Password'
]
[
$class
:
'UsernamePasswordMultiBinding'
,
credentialsId:
"${params.UE_Credentials}"
,
usernameVariable:
'UE_Username'
,
passwordVariable:
'UE_Password'
]
...
@@ -205,9 +206,11 @@ pipeline {
...
@@ -205,9 +206,11 @@ pipeline {
sh
"python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --UEIPAddress=${params.eNB_IPAddress} --UEUserName=${eNB_Username} --UEPassword=${eNB_Password} --eNBBranch=${eNB_Branch} --eNBSourceCodePath=${params.eNB_SourceCodePath} --UESourceCodePath=${params.eNB_SourceCodePath} --eNBRepository=${eNB_Repository} --eNBCommitID=${eNB_CommitID} --ADBIPAddress=${ADB_IPAddress} --EPCIPAddress=${EPC_IPAddress} --XMLTestFile=${xmlFile}"
sh
"python3 main.py --mode=TesteNB --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password} --UEIPAddress=${params.eNB_IPAddress} --UEUserName=${eNB_Username} --UEPassword=${eNB_Password} --eNBBranch=${eNB_Branch} --eNBSourceCodePath=${params.eNB_SourceCodePath} --UESourceCodePath=${params.eNB_SourceCodePath} --eNBRepository=${eNB_Repository} --eNBCommitID=${eNB_CommitID} --ADBIPAddress=${ADB_IPAddress} --EPCIPAddress=${EPC_IPAddress} --XMLTestFile=${xmlFile}"
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
currentBuild
.
result
=
'FAILURE'
currentBuild
.
result
=
'FAILURE'
buildStageStatus
=
false
}
}
}
}
}
}
sh
"python3 main.py --mode=FinalizeHtml --finalStatus=${buildStageStatus} --eNBIPAddress=${params.eNB_IPAddress} --eNBUserName=${eNB_Username} --eNBPassword=${eNB_Password}"
}
}
}
}
}
}
...
...
ci-scripts/main.py
View file @
53ecaf97
...
@@ -2854,11 +2854,11 @@ class SSHConnection():
...
@@ -2854,11 +2854,11 @@ class SSHConnection():
self
.
htmlFile
.
write
(
' <td></td>
\n
'
)
self
.
htmlFile
.
write
(
' <td></td>
\n
'
)
self
.
htmlFile
.
write
(
' </tr>
\n
'
)
self
.
htmlFile
.
write
(
' </tr>
\n
'
)
self
.
htmlFile
.
write
(
' <tr>
\n
'
)
self
.
htmlFile
.
write
(
' <tr>
\n
'
)
self
.
htmlFile
.
write
(
' <th colspan=
4
bgcolor = "#33CCFF">Final Status</th>
\n
'
)
self
.
htmlFile
.
write
(
' <th colspan=
5
bgcolor = "#33CCFF">Final Status</th>
\n
'
)
if
passStatus
:
if
passStatus
:
self
.
htmlFile
.
write
(
' <th colspan=
2
bgcolor="green"><font color="white">PASS <span class="glyphicon glyphicon-ok"></span></font></th>
\n
'
)
self
.
htmlFile
.
write
(
' <th colspan=
3
bgcolor="green"><font color="white">PASS <span class="glyphicon glyphicon-ok"></span></font></th>
\n
'
)
else
:
else
:
self
.
htmlFile
.
write
(
' <th colspan=
2
bgcolor="red"><font color="white">FAIL <span class="glyphicon glyphicon-remove"></span> </font></th>
\n
'
)
self
.
htmlFile
.
write
(
' <th colspan=
3
bgcolor="red"><font color="white">FAIL <span class="glyphicon glyphicon-remove"></span> </font></th>
\n
'
)
self
.
htmlFile
.
write
(
' </tr>
\n
'
)
self
.
htmlFile
.
write
(
' </tr>
\n
'
)
self
.
htmlFile
.
write
(
' </table>
\n
'
)
self
.
htmlFile
.
write
(
' </table>
\n
'
)
self
.
htmlFile
.
write
(
' <p></p>
\n
'
)
self
.
htmlFile
.
write
(
' <p></p>
\n
'
)
...
...
ci-scripts/xml_files/gnb_nr_ue_usrp_run.xml
View file @
53ecaf97
...
@@ -21,8 +21,8 @@
...
@@ -21,8 +21,8 @@
-->
-->
<testCaseList>
<testCaseList>
<htmlTabRef>
run
OAI gNB and OAI NR UE
USRP
</htmlTabRef>
<htmlTabRef>
run
-OAI-gNB-NR-UE-
USRP
</htmlTabRef>
<htmlTabName>
run
-OAI-gNB-NR-UE-
USRP
</htmlTabName>
<htmlTabName>
run
OAI gNB and OAI NR UE
USRP
</htmlTabName>
<htmlTabIcon>
tasks
</htmlTabIcon>
<htmlTabIcon>
tasks
</htmlTabIcon>
<TestCaseRequestedList>
<TestCaseRequestedList>
090101 000001 090102 000001 090108 090109
090101 000001 090102 000001 090108 090109
...
...
ci-scripts/xml_files/gnb_usrp_build.xml
View file @
53ecaf97
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
-->
-->
<testCaseList>
<testCaseList>
<htmlTabRef>
build-tab
</htmlTabRef>
<htmlTabRef>
gnb-
build-tab
</htmlTabRef>
<htmlTabName>
Build-gNB
</htmlTabName>
<htmlTabName>
Build-gNB
</htmlTabName>
<htmlTabIcon>
wrench
</htmlTabIcon>
<htmlTabIcon>
wrench
</htmlTabIcon>
<TestCaseRequestedList>
<TestCaseRequestedList>
...
...
ci-scripts/xml_files/nr_ue_usrp_build.xml
View file @
53ecaf97
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
-->
-->
<testCaseList>
<testCaseList>
<htmlTabRef>
build-tab
</htmlTabRef>
<htmlTabRef>
nr-ue-
build-tab
</htmlTabRef>
<htmlTabName>
Build-NR-UE
</htmlTabName>
<htmlTabName>
Build-NR-UE
</htmlTabName>
<htmlTabIcon>
wrench
</htmlTabIcon>
<htmlTabIcon>
wrench
</htmlTabIcon>
<TestCaseRequestedList>
<TestCaseRequestedList>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment