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
15
Merge Requests
15
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
oai
openairinterface5G
Commits
81d7cdcf
Commit
81d7cdcf
authored
Mar 16, 2016
by
Florian Kaltenberger
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
https://gitlab.eurecom.fr/oai/openairinterface5g
into develop
parents
ede2d8e6
91d8c892
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
52 additions
and
44 deletions
+52
-44
.gitlab-ci.yml
.gitlab-ci.yml
+3
-2
cmake_targets/autotests/run_exec_lte-softmodem_tests.py
cmake_targets/autotests/run_exec_lte-softmodem_tests.py
+8
-1
cmake_targets/autotests/test_case_list.xml
cmake_targets/autotests/test_case_list.xml
+41
-41
No files found.
.gitlab-ci.yml
View file @
81d7cdcf
...
...
@@ -8,6 +8,7 @@ job1:
-
echo $EXTERNAL_SHARE_DIR
-
echo $SHELL
-
git rev-parse --abbrev-ref HEAD
-
git_repo=`git config --get remote.origin.url`
-
git_head=`git rev-parse HEAD`
-
echo $git_head
-
tmp=`git show-ref --head | grep $git_head`
...
...
@@ -23,8 +24,8 @@ job1:
-
echo $NRUNS_LTE_SOFTMODEM
-
echo $TIMEOUT_CMD
-
mkdir -p $OPENAIR_DIR/cmake_targets/autotests/log
-
python $OPENAIR_DIR/cmake_targets/autotests/run_exec_lte-softmodem_tests.py -c -5GRepoHeadVersion $git_head -n $NFS_SHARE_DIR -u $OAI_USER -p $OAI_PASS $OAI_EXTRA_ARGS -g "$OAI_TEST_CASE_GROUP">& $OPENAIR_DIR/cmake_targets/autotests/python_autotest_cleanup.log
-
python $OPENAIR_DIR/cmake_targets/autotests/run_exec_lte-softmodem_tests.py -r -5GRepoHeadVersion $git_head -n $NFS_SHARE_DIR -u $OAI_USER -p $OAI_PASS `echo $OAI_EXTRA_ARGS` -g "$OAI_TEST_CASE_GROUP" --nrun_lte_softmodem $NRUNS_LTE_SOFTMODEM --timeout_cmd $TIMEOUT_CMD >& $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log
-
python $OPENAIR_DIR/cmake_targets/autotests/run_exec_lte-softmodem_tests.py -c -5GRepo
$git_repo -5GRepo
HeadVersion $git_head -n $NFS_SHARE_DIR -u $OAI_USER -p $OAI_PASS $OAI_EXTRA_ARGS -g "$OAI_TEST_CASE_GROUP">& $OPENAIR_DIR/cmake_targets/autotests/python_autotest_cleanup.log
-
python $OPENAIR_DIR/cmake_targets/autotests/run_exec_lte-softmodem_tests.py -r -5GRepo
$git_repo -5GRepo
HeadVersion $git_head -n $NFS_SHARE_DIR -u $OAI_USER -p $OAI_PASS `echo $OAI_EXTRA_ARGS` -g "$OAI_TEST_CASE_GROUP" --nrun_lte_softmodem $NRUNS_LTE_SOFTMODEM --timeout_cmd $TIMEOUT_CMD >& $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
-
mv $OPENAIR_DIR/cmake_targets/autotests/python_autotest_cleanup.log $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest_cleanup.log
-
sshpass -p "$OAI_PASS" rsync -az -e "ssh -o StrictHostKeyChecking=no " --rsync-path="mkdir -p $NFS_TEST_RESULTS_DIR && rsync" $OPENAIR_DIR/cmake_targets/autotests/log $OAI_USER@localhost:$NFS_TEST_RESULTS_DIR
...
...
cmake_targets/autotests/run_exec_lte-softmodem_tests.py
View file @
81d7cdcf
...
...
@@ -1105,6 +1105,7 @@ pw =''
i
=
0
dlsim
=
0
localshell
=
0
GitOAI5GRepo
=
''
GitOAI5GRepoBranch
=
''
GitOAI5GHeadVersion
=
''
user
=
''
...
...
@@ -1141,6 +1142,9 @@ while i < len (sys.argv):
i
=
i
+
1
elif
arg
==
'-c'
:
cleanUpRemoteMachines
=
True
elif
arg
==
'-5GRepo'
:
GitOAI5GRepo
=
sys
.
argv
[
i
+
1
]
i
=
i
+
1
elif
arg
==
'-5GRepoBranch'
:
GitOAI5GRepoBranch
=
sys
.
argv
[
i
+
1
]
i
=
i
+
1
...
...
@@ -1190,6 +1194,7 @@ while i < len (sys.argv):
print
"-r: Remove the log directory in autotests"
print
"-g: Run test cases in a group"
print
"-c: Run cleanup scripts on remote machines and exit"
print
"-5GRepo: Repository for OAI 5G to use to run tests (overrides GitOAI5GRepo in test_case_list.xml)"
print
"-5GRepoBranch: Branch for OAI 5G Repository to run tests (overrides the branch in test_case_list.xml)"
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"
...
...
@@ -1278,7 +1283,9 @@ if MachineList =='':
MachineList
=
xmlRoot
.
findtext
(
'MachineList'
,
default
=
''
)
NFSResultsShare
=
xmlRoot
.
findtext
(
'NFSResultsShare'
,
default
=
''
)
GitOpenaircnRepo
=
xmlRoot
.
findtext
(
'GitOpenair-cnRepo'
,
default
=
''
)
GitOAI5GRepo
=
xmlRoot
.
findtext
(
'GitOAI5GRepo'
,
default
=
''
)
if
GitOAI5GRepo
==
''
:
GitOAI5GRepo
=
xmlRoot
.
findtext
(
'GitOAI5GRepo'
,
default
=
''
)
if
GitOAI5GRepoBranch
==
''
:
GitOAI5GRepoBranch
=
xmlRoot
.
findtext
(
'GitOAI5GRepoBranch'
,
default
=
''
)
...
...
cmake_targets/autotests/test_case_list.xml
View file @
81d7cdcf
This diff is collapsed.
Click to expand it.
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