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
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 26 deletions
ci-scripts/main.py
View file @ 7736990c
...@@ -541,36 +541,38 @@ class SSHConnection(): ...@@ -541,36 +541,38 @@ 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)
self.command('ls *.txt', '\$', 5) if self.clean_repository:
result = re.search('LAST_BUILD_INFO', str(self.ssh.before)) self.command('ls *.txt', '\$', 5)
if result is not None: result = re.search('LAST_BUILD_INFO', str(self.ssh.before))
mismatch = False if result is not None:
self.command('grep SRC_COMMIT LAST_BUILD_INFO.txt', '\$', 2) mismatch = False
result = re.search(self.ranCommitID, str(self.ssh.before)) self.command('grep SRC_COMMIT LAST_BUILD_INFO.txt', '\$', 2)
if result is None: result = re.search(self.ranCommitID, str(self.ssh.before))
mismatch = True
self.command('grep MERGED_W_TGT_BRANCH LAST_BUILD_INFO.txt', '\$', 2)
if (self.ranAllowMerge):
result = re.search('YES', str(self.ssh.before))
if result is None: if result is None:
mismatch = True mismatch = True
self.command('grep TGT_BRANCH LAST_BUILD_INFO.txt', '\$', 2) self.command('grep MERGED_W_TGT_BRANCH LAST_BUILD_INFO.txt', '\$', 2)
if self.ranTargetBranch == '': if (self.ranAllowMerge):
result = re.search('develop', str(self.ssh.before)) result = re.search('YES', str(self.ssh.before))
if result is None:
mismatch = True
self.command('grep TGT_BRANCH LAST_BUILD_INFO.txt', '\$', 2)
if self.ranTargetBranch == '':
result = re.search('develop', str(self.ssh.before))
else:
result = re.search(self.ranTargetBranch, str(self.ssh.before))
if result is None:
mismatch = True
else: else:
result = re.search(self.ranTargetBranch, str(self.ssh.before)) result = re.search('NO', str(self.ssh.before))
if result is None: if result is None:
mismatch = True mismatch = True
else: if not mismatch:
result = re.search('NO', str(self.ssh.before)) self.close()
if result is None: self.CreateHtmlTestRow(self.Build_eNB_args, 'OK', ALL_PROCESSES_OK)
mismatch = True return
if not mismatch:
self.close() self.command('echo ' + self.UEPassword + ' | sudo -S git clean -x -d -ff', '\$', 30)
self.CreateHtmlTestRow(self.Build_eNB_args, 'OK', ALL_PROCESSES_OK)
return
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