Skip to content

O
OpenXG UE
Commit 7736990c authored by Raphael Defosseux's avatar Raphael Defosseux
Browse files
Options

CI: fix after merge conflicts... 

Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent 02319ae6
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 26 deletions
ci-scripts/main.py
View file @ 7736990c
...@@ -541,6 +541,7 @@ class SSHConnection(): ...@@ -541,6 +541,7 @@ class SSHConnection():
# here add a check if git clone or git fetch went smoothly # here add a check if git clone or git fetch went smoothly
self.command('git config user.email "jenkins@openairinterface.org"', '\$', 5) self.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
self.command('git config user.name "OAI Jenkins"', '\$', 5) self.command('git config user.name "OAI Jenkins"', '\$', 5)
if self.clean_repository:
self.command('ls *.txt', '\$', 5) self.command('ls *.txt', '\$', 5)
result = re.search('LAST_BUILD_INFO', str(self.ssh.before)) result = re.search('LAST_BUILD_INFO', str(self.ssh.before))
if result is not None: if result is not None:
...@@ -571,6 +572,7 @@ class SSHConnection(): ...@@ -571,6 +572,7 @@ class SSHConnection():
return return
self.command('echo ' + self.UEPassword + ' | sudo -S git clean -x -d -ff', '\$', 30) self.command('echo ' + self.UEPassword + ' | sudo -S git clean -x -d -ff', '\$', 30)
# if the commit ID is provided use it to point to it # if the commit ID is provided use it to point to it
if self.ranCommitID != '': if self.ranCommitID != '':
self.command('git checkout -f ' + self.ranCommitID, '\$', 5) self.command('git checkout -f ' + self.ranCommitID, '\$', 5)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment