Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
openairinterface5G
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Merge Requests
20
Merge Requests
20
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
oai
openairinterface5G
Commits
d39f2182
Commit
d39f2182
authored
Dec 29, 2015
by
Rohit Gupta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added extra options for setting NFS SHARE
parent
dc020be2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
cmake_targets/autotests/run_exec_lte-softmodem_tests.py
cmake_targets/autotests/run_exec_lte-softmodem_tests.py
+7
-2
No files found.
.gitlab-ci.yml
View file @
d39f2182
...
...
@@ -20,7 +20,7 @@ job1:
-
echo $EXTERNAL_SHARE_RESULTS_DIR
-
mkdir -p $NFS_TEST_RESULTS_DIR
-
mkdir -p $EXTERNAL_SHARE_RESULTS_DIR
-
python $OPENAIR_DIR/cmake_targets/autotests/run_exec_lte-softmodem_tests.py -r -5GRepoHeadVersion $git_head $OAI_EXTRA_ARGS >& $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log
-
python $OPENAIR_DIR/cmake_targets/autotests/run_exec_lte-softmodem_tests.py -r -5GRepoHeadVersion $git_head
-n $NFS_SHARE_DIR
$OAI_EXTRA_ARGS >& $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log
-
mv $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest.log
-
sshpass -p "$OAI_PASS" rsync -avz -e "ssh -o StrictHostKeyChecking=no " $OPENAIR_DIR/cmake_targets/autotests/log/ $OAI_USER@localhost:$NFS_TEST_RESULTS_DIR
-
sshpass -p "$OAI_PASS" rsync -avz -e "ssh -o StrictHostKeyChecking=no " $OPENAIR_DIR/cmake_targets/autotests/log/ $OAI_USER@localhost:$EXTERNAL_SHARE_DIR
...
...
cmake_targets/autotests/run_exec_lte-softmodem_tests.py
View file @
d39f2182
...
...
@@ -905,7 +905,7 @@ def cleanOldProgramsAllMachines(oai_list, CleanOldProgs, CleanUpAluLteBox, Exmim
threadList
=
[]
for
oai
in
oai_list
:
threadName
=
"cleanup_thread_"
+
str
(
threadId
)
thread
=
append
(
oaiCleanOldProgramThread
(
threadId
,
threadName
,
oai
,
CleanUpOldProgs
,
CleanUpAluLteBox
,
ExmimoRfStop
)
)
thread
=
oaiCleanOldProgramThread
(
threadId
,
threadName
,
oai
,
CleanUpOldProgs
,
CleanUpAluLteBox
,
ExmimoRfStop
)
threadList
.
append
(
thread
)
thread
.
start
()
threadId
=
threadId
+
1
...
...
@@ -926,6 +926,7 @@ GitOAI5GRepoBranch=''
GitOAI5GHeadVersion
=
''
user
=
''
pw
=
''
NFSResultsShare
=
''
openairdir_local
=
os
.
environ
.
get
(
'OPENAIR_DIR'
)
if
openairdir_local
is
None
:
print
"Environment variable OPENAIR_DIR not set correctly"
...
...
@@ -979,6 +980,9 @@ while i < len (sys.argv):
elif
arg
==
'-p'
:
pw
=
sys
.
argv
[
i
+
1
]
i
=
i
+
1
elif
arg
==
'-n'
:
NFSResultsShare
=
sys
.
argv
[
i
+
1
]
i
=
i
+
1
elif
arg
==
'-h'
:
print
"-d: low debug level"
print
"-dd: high debug level"
...
...
@@ -992,6 +996,7 @@ while i < len (sys.argv):
print
"-5GRepoHeadVersion: Head commit on which to run tests (overrides the branch in test_case_list.xml)"
print
"-u: use the user name passed as argument"
print
"-p: use the password passed as an argument"
print
"-n: Set the NFS share passed as an argument"
sys
.
exit
()
else
:
print
"Unrecongnized Option: <"
+
arg
+
">. Use -h to see valid options"
...
...
@@ -1380,7 +1385,7 @@ print "Deleting NFSTestResults Dir..." + res
print
"Copying files from GilabCI Runner Machine : "
+
host
+
"locallogdir = "
+
locallogdir
+
", NFSTestsResultsDir = "
+
NFSTestsResultsDir
#ssh = SSHSession(UEMachine , username=user, key_file=None, password=password)
#ssh.get_all(logdir_UE , logdir_local + '/cmake_targets/autotests/log/'+ testcasename)
SSHSessionWrapper
(
UEMachine
,
user
,
None
,
password
,
NFSTestsResultsDir
,
locallogdir
,
"put_all"
)
SSHSessionWrapper
(
'localhost'
,
user
,
None
,
password
,
NFSTestsResultsDir
,
locallogdir
,
"put_all"
)
sys
.
exit
()
...
...
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