Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG
OpenXG-RAN
Commits
c40130ec
Commit
c40130ec
authored
Nov 08, 2021
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ci): fix some typos
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@eurecom.fr
>
parent
1e810c08
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
+1
-1
ci-scripts/cls_containerize.py
ci-scripts/cls_containerize.py
+1
-1
ci-scripts/cls_oaicitest.py
ci-scripts/cls_oaicitest.py
+1
-1
ci-scripts/ran.py
ci-scripts/ran.py
+6
-2
No files found.
ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
View file @
c40130ec
...
@@ -293,7 +293,7 @@ pipeline {
...
@@ -293,7 +293,7 @@ pipeline {
echo
'\u2705 \u001B[32mLog Collection (SPGW or SMF/UPF)\u001B[0m'
echo
'\u2705 \u001B[32mLog Collection (SPGW or SMF/UPF)\u001B[0m'
sh
"python3 ci-scripts/main.py --mode=LogCollectSPGW --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
sh
"python3 ci-scripts/main.py --mode=LogCollectSPGW --EPCIPAddress=${params.EPC_IPAddress} --EPCUserName=${EPC_Username} --EPCPassword=${EPC_Password} --EPCSourceCodePath=${params.EPC_SourceCodePath} --EPCType=${params.EPC_Type}"
if
(
params
.
EPC_Type
==
'OAICN5G'
)
{
if
(
params
.
EPC_Type
==
'OAICN5G'
)
{
sh
"sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/s
mf-upf.log.zip ./spgw
.log.${env.BUILD_ID}.zip || true"
sh
"sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/s
pgw.log.zip ./smf-upf
.log.${env.BUILD_ID}.zip || true"
}
else
{
}
else
{
sh
"sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/spgw.log.zip ./spgw.log.${env.BUILD_ID}.zip || true"
sh
"sshpass -p \'${EPC_Password}\' scp -o 'StrictHostKeyChecking no' -o 'ConnectTimeout 10' ${EPC_Username}@${params.EPC_IPAddress}:${EPC_SourceCodePath}/scripts/spgw.log.zip ./spgw.log.${env.BUILD_ID}.zip || true"
}
}
...
...
ci-scripts/cls_containerize.py
View file @
c40130ec
...
@@ -206,7 +206,7 @@ class Containerize():
...
@@ -206,7 +206,7 @@ class Containerize():
self
.
testCase_id
=
HTML
.
testCase_id
self
.
testCase_id
=
HTML
.
testCase_id
self
.
_createWorkspace
(
mySSH
,
lPass
w
ord
,
lSourcePath
)
self
.
_createWorkspace
(
mySSH
,
lPass
W
ord
,
lSourcePath
)
# if asterix, copy the entitlement and subscription manager configurations
# if asterix, copy the entitlement and subscription manager configurations
if
self
.
host
==
'Red Hat'
:
if
self
.
host
==
'Red Hat'
:
...
...
ci-scripts/cls_oaicitest.py
View file @
c40130ec
...
@@ -2325,7 +2325,7 @@ class OaiCiTest():
...
@@ -2325,7 +2325,7 @@ class OaiCiTest():
server_filename
=
'iperf_server_'
+
self
.
testCase_id
+
'_'
+
self
.
ue_id
+
'.log'
server_filename
=
'iperf_server_'
+
self
.
testCase_id
+
'_'
+
self
.
ue_id
+
'.log'
SSH
.
command
(
'docker exec -it prod-trf-gen /bin/bash -c "killall --signal SIGKILL iperf"'
,
'\$'
,
5
)
SSH
.
command
(
'docker exec -it prod-trf-gen /bin/bash -c "killall --signal SIGKILL iperf"'
,
'\$'
,
5
)
iperf_cmd
=
'echo $USER; nohup bin/iperf -s -u 2>&1 > '
+
server_filename
iperf_cmd
=
'echo $USER; nohup bin/iperf -s -u 2>&1 > '
+
server_filename
cmd
=
'docker exec -
it
prod-trf-gen /bin/bash -c
\"
'
+
iperf_cmd
+
'
\"
'
cmd
=
'docker exec -
d
prod-trf-gen /bin/bash -c
\"
'
+
iperf_cmd
+
'
\"
'
SSH
.
command
(
cmd
,
'\$'
,
5
)
SSH
.
command
(
cmd
,
'\$'
,
5
)
SSH
.
close
()
SSH
.
close
()
...
...
ci-scripts/ran.py
View file @
c40130ec
...
@@ -593,8 +593,12 @@ class RANManagement():
...
@@ -593,8 +593,12 @@ class RANManagement():
lPassWord
=
self
.
eNBPassword
lPassWord
=
self
.
eNBPassword
mySSH
=
SSH
.
SSHConnection
()
mySSH
=
SSH
.
SSHConnection
()
mySSH
.
open
(
lIpAddr
,
lUserName
,
lPassWord
)
mySSH
.
open
(
lIpAddr
,
lUserName
,
lPassWord
)
mySSH
.
command
(
'stdbuf -o0 ps -aux | grep --color=never '
+
self
.
air_interface
[
self
.
eNB_instance
]
+
' | grep -v grep'
,
'\$'
,
5
)
if
self
.
air_interface
[
self
.
eNB_instance
]
==
''
:
result
=
re
.
search
(
self
.
air_interface
[
self
.
eNB_instance
],
mySSH
.
getBefore
())
pattern
=
'softmodem'
else
:
pattern
=
self
.
air_interface
[
self
.
eNB_instance
]
mySSH
.
command
(
'stdbuf -o0 ps -aux | grep --color=never '
+
pattern
+
' | grep -v grep'
,
'\$'
,
5
)
result
=
re
.
search
(
pattern
,
mySSH
.
getBefore
())
if
result
is
None
:
if
result
is
None
:
logging
.
debug
(
'
\u001B
[1;37;41m eNB Process Not Found!
\u001B
[0m'
)
logging
.
debug
(
'
\u001B
[1;37;41m eNB Process Not Found!
\u001B
[0m'
)
status_queue
.
put
(
CONST
.
ENB_PROCESS_FAILED
)
status_queue
.
put
(
CONST
.
ENB_PROCESS_FAILED
)
...
...
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