| |
@@ -121,23 +121,46 @@
|
| |
'./repospanner',
|
| |
'/usr/bin/repospanner',
|
| |
]
|
| |
+ possible_paths_hookrunner = [
|
| |
+ './repohookrunner',
|
| |
+ '/usr/bin/repohookrunner',
|
| |
+ '/usr/libexec/repohookrunner',
|
| |
+ ]
|
| |
+ possible_paths_repobridge = [
|
| |
+ './repobridge',
|
| |
+ '/usr/bin/repobridge',
|
| |
+ '/usr/libexec/repobridge',
|
| |
+ ]
|
| |
|
| |
for option in possible_paths:
|
| |
option = os.path.abspath(option)
|
| |
if os.path.exists(option):
|
| |
self.repospanner_binary = option
|
| |
break
|
| |
+ for option in possible_paths_hookrunner:
|
| |
+ option = os.path.abspath(option)
|
| |
+ if os.path.exists(option):
|
| |
+ hookrunbin = option
|
| |
+ break
|
| |
+ for option in possible_paths_repobridge:
|
| |
+ option = os.path.abspath(option)
|
| |
+ if os.path.exists(option):
|
| |
+ repobridgebin = option
|
| |
+ break
|
| |
+
|
| |
+ print("XXXXX")
|
| |
+ a = os.listdir("/usr/bin")
|
| |
+ for i in a:
|
| |
+ if i.startswith("repo"):
|
| |
+ print(i)
|
| |
|
| |
if not self.repospanner_binary:
|
| |
raise unittest.SkipTest('repoSpanner not found')
|
| |
|
| |
- hookrunbin = os.path.join(os.path.dirname(self.repospanner_binary),
|
| |
- 'repohookrunner')
|
| |
- if not os.path.exists(hookrunbin):
|
| |
+ if not hookrunbin:
|
| |
raise Exception('repoSpanner found, but repohookrunner not')
|
| |
- repobridgebin = os.path.join(os.path.dirname(self.repospanner_binary),
|
| |
- 'repobridge')
|
| |
- if not os.path.exists(repobridgebin):
|
| |
+
|
| |
+ if not repobridgebin:
|
| |
raise Exception('repoSpanner found, but repobridge not')
|
| |
|
| |
self.config_values['repobridge_binary'] = repobridgebin
|
| |
karsten
commented 5 years ago
unfortunately the jenkins environment seems to be different from whatever you'd get when you'd try to run tests locally. Run some checks in jenkins to determine the repospanner issue.