4
0
mirror of https://github.com/QuasarApp/QuasarAppCI.git synced 2025-05-11 20:59:36 +00:00

added auth

This commit is contained in:
Andrei Yankovich 2019-07-22 21:21:58 +03:00
parent 10d1a88177
commit 917e7a7efd
3 changed files with 28 additions and 17 deletions

@ -29,12 +29,17 @@ class buildBotIdentity(BuildBotModule):
self.masterConf['www']['authz'] = util.Authz(
allowRules = [
util.AnyEndpointMatcher(role="admins"),
util.AnyEndpointMatcher(role="admins")
],
roleMatchers = [
util.RolesFromUsername(roles=['admins'], usernames=['EndrII']),
util.RolesFromUsername(roles=['admins'], usernames=['ZIG']),
util.RolesFromUsername(roles=['admins'], usernames=['ZIG'])
]
],
util.GitHubAuth("clientid", "clientsecret")
)
secret = SecretManager("/home/andrei/buildBotSecret/secret.json")

@ -22,16 +22,34 @@ class buildBotShedulers(BuildBotModule):
)
def getShedulers(self, builders, prop):
def initScheduler(self):
self.masterConf['schedulers'] = self.shedulers + [
schedulers.AnyBranchScheduler(
name='Tester',
builderNames=builders,
properties=prop,
builderNames=['Tester'],
properties= {
'clean': True,
'test': True,
'release': False,
'deploy': False,
'Linux': True,
'Windows': True,
'Android': True
},
treeStableTimer = None
),
schedulers.SingleBranchScheduler(
name='NPM Deployer',
change_filter=util.ChangeFilter(branch='master')
builderNames=['NPM'],
properties = []
treeStableTimer = None
)
]
return self.getMasterConf();

@ -71,17 +71,5 @@ class BuildBot:
def getMaster(self):
prop = {
'clean': True,
'test': True,
'release': False,
'deploy': False,
'Linux': True,
'Windows': True,
'Android': True
}
self.masterConf.update(self.shedulers.getShedulers(['Tester'], prop));
self.masterConf.update(self.shedulers.initScheduler());
return self.masterConf