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
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
zzha zzha
OpenXG-RAN
Commits
1980f105
Commit
1980f105
authored
Jul 11, 2019
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CI: little fixes
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@eurecom.fr
>
parent
a371da7b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
ci-scripts/doGitLabMerge.sh
ci-scripts/doGitLabMerge.sh
+10
-1
ci-scripts/main.py
ci-scripts/main.py
+1
-0
No files found.
ci-scripts/doGitLabMerge.sh
View file @
1980f105
...
...
@@ -125,7 +125,16 @@ fi
git config user.email
"jenkins@openairinterface.org"
git config user.name
"OAI Jenkins"
git checkout
-f
$SOURCE_COMMIT_ID
git checkout
-f
$SOURCE_COMMIT_ID
>
checkout.txt 2>&1
STATUS
=
`
egrep
-c
"fatal: reference is not a tree"
checkout.txt
`
rm
-f
checkout.txt
if
[
$STATUS
-ne
0
]
then
echo
"fatal: reference is not a tree -->
$SOURCE_COMMIT_ID
"
STATUS
=
-1
exit
$STATUS
fi
git log
-n1
--pretty
=
format:
\"
%s
\"
>
.git/CI_COMMIT_MSG
git merge
--ff
$TARGET_COMMIT_ID
-m
"Temporary merge for CI"
...
...
ci-scripts/main.py
View file @
1980f105
...
...
@@ -3986,6 +3986,7 @@ if re.match('^TerminateeNB$', mode, re.IGNORECASE):
if
SSH
.
eNBIPAddress
==
''
or
SSH
.
eNBUserName
==
''
or
SSH
.
eNBPassword
==
''
:
Usage
()
sys
.
exit
(
'Insufficient Parameter'
)
SSH
.
eNB_serverId
=
'0'
SSH
.
TerminateeNB
()
elif
re
.
match
(
'^TerminateUE$'
,
mode
,
re
.
IGNORECASE
):
if
(
SSH
.
ADBIPAddress
==
''
or
SSH
.
ADBUserName
==
''
or
SSH
.
ADBPassword
==
''
):
...
...
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