Differential D1167

Remove koji_url option which is not used anymore
ClosedPublic
Actions

Authored by mkrizek on Mar 14 2017, 1:57 PM.

Details

Reviewers
kparal
tflink
Group Reviewers
taskotron-trigger
Commits
rTRGRecdb37a22491: Remove koji_url option which is not used anymore
Test Plan

None

Diff Detail

Repository
rTRGR taskotron-trigger
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
mkrizek created this revision.Mar 14 2017, 1:57 PM
kparal accepted this revision.Mar 15 2017, 12:38 PM
This revision is now accepted and ready to land.Mar 15 2017, 12:38 PM
tflink accepted this revision.Mar 16 2017, 3:22 PM
Closed by commit rTRGRecdb37a22491: Remove koji_url option which is not used anymore (authored by Martin Krizek <mkrizek@redhat.com>). · Explain WhyMar 17 2017, 1:10 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathPackages
Mconf/trigger.cfg.example (7 lines)
Mjobtriggers/config.py (2 lines)

Diff 2979

View Options

conf/trigger.cfg.example

1[buildbot] 1​[buildbot]
2url = http://localhost:8080/buildbot/change_hook 2​url = http://localhost:8080/buildbot/change_hook
3 3​
4 ​
5[trigger] 4​[trigger]
6valid_arches = x86_64 5​valid_arches = x86_64
7koji_url = http://koji.fedoraproject.org/kojihub ​
8datagrepper_url = https://apps.fedoraproject.org/datagrepper/raw 6​datagrepper_url = https://apps.fedoraproject.org/datagrepper/raw
9execdb_server = http://localhost:5003 7​execdb_server = http://localhost:5003
10runner_type = StreamRunner 8​runner_type = StreamRunner
11job_logging = False 9​job_logging = False
12joblog_file = /var/log/taskotron-trigger/jobs.csv 10​joblog_file = /var/log/taskotron-trigger/jobs.csv
13fuse_delay = 1000 ; seconds 11​fuse_delay = 1000 ; seconds
14git_cache_dir = /var/lib/taskotron-trigger/cache 12​git_cache_dir = /var/lib/taskotron-trigger/cache
15rules_template = /etc/taskotron/trigger_rules.yml 13​rules_template = /etc/taskotron/trigger_rules.yml
16 14​deployment_type = prod ; possible values are: [prod,stg,dev]
17; possible values are: [prod,stg,dev] ​
18deployment_type = prod ​
19 ​
20 15​
21[koji_build_completed] 16​[koji_build_completed]
22critpath_filepath = /var/lib/taskotron-trigger/critpath_whitelist 17​critpath_filepath = /var/lib/taskotron-trigger/critpath_whitelist
View Options

jobtriggers/config.py

1import ConfigParser 1​import ConfigParser
2import io 2​import io
3 3​
4defaults = """ 4​defaults = """
5[buildbot] 5​[buildbot]
6url = http://localhost:8080/buildbot/change_hook 6​url = http://localhost:8080/buildbot/change_hook
7 7​
8[trigger] 8​[trigger]
9valid_arches = x86_64 9​valid_arches = x86_64
10koji_url = http://koji.fedoraproject.org/kojihub ​
11datagrepper_url = https://apps.fedoraproject.org/datagrepper/raw 10​datagrepper_url = https://apps.fedoraproject.org/datagrepper/raw
12execdb_server = http://localhost:5003 11​execdb_server = http://localhost:5003
13runner_type = StreamRunner 12​runner_type = StreamRunner
14job_logging = False 13​job_logging = False
15joblog_file = /var/log/taskotron-trigger/jobs.csv 14​joblog_file = /var/log/taskotron-trigger/jobs.csv
16fuse_delay = 1000 ; seconds 15​fuse_delay = 1000 ; seconds
17git_cache_dir = /var/lib/taskotron-trigger/cache 16​git_cache_dir = /var/lib/taskotron-trigger/cache
18rules_template = ./conf/trigger_rules.yml.example 17​rules_template = ./conf/trigger_rules.yml.example
19deployment_type = prod 18​deployment_type = prod
20 19​
21[koji_build_completed] 20​[koji_build_completed]
22critpath_filepath = /var/lib/taskotron-trigger/critpath_whitelist 21​critpath_filepath = /var/lib/taskotron-trigger/critpath_whitelist
23""" 22​"""
24 23​
25config = ConfigParser.ConfigParser() 24​config = ConfigParser.ConfigParser()
26config.readfp(io.BytesIO(defaults)) 25​config.readfp(io.BytesIO(defaults))
27config.read(['/etc/taskotron/trigger.cfg', './conf/trigger.cfg']) 26​config.read(['/etc/taskotron/trigger.cfg', './conf/trigger.cfg'])
28 27​
29 28​
30buildbot_url = config.get('buildbot', 'url') 29​buildbot_url = config.get('buildbot', 'url')
31 30​
32valid_arches = [e.strip() for e in config.get('trigger', 'valid_arches').split(',') if e] 31​valid_arches = [e.strip() for e in config.get('trigger', 'valid_arches').split(',') if e]
33koji_url = config.get('trigger', 'koji_url') ​
34datagrepper_url = config.get('trigger', 'datagrepper_url') 32​datagrepper_url = config.get('trigger', 'datagrepper_url')
35execdb_server = config.get('trigger', 'execdb_server') 33​execdb_server = config.get('trigger', 'execdb_server')
36runner_type = config.get('trigger', 'runner_type') 34​runner_type = config.get('trigger', 'runner_type')
37job_logging = True if config.get('trigger', 'job_logging') == 'True' else False 35​job_logging = True if config.get('trigger', 'job_logging') == 'True' else False
38joblog_file = config.get('trigger', 'joblog_file') 36​joblog_file = config.get('trigger', 'joblog_file')
39fuse_delay = int(config.get('trigger', 'fuse_delay')) # seconds 37​fuse_delay = int(config.get('trigger', 'fuse_delay')) # seconds
40git_cache_dir = config.get('trigger', 'git_cache_dir') 38​git_cache_dir = config.get('trigger', 'git_cache_dir')
41rules_template_file = config.get('trigger', 'rules_template') 39​rules_template_file = config.get('trigger', 'rules_template')
42deployment_type = config.get('trigger', 'deployment_type') 40​deployment_type = config.get('trigger', 'deployment_type')
43 41​
44critpath_filepath = config.get('koji_build_completed', 'critpath_filepath') 42​critpath_filepath = config.get('koji_build_completed', 'critpath_filepath')
45 43​
46trigger_rules_template = open(rules_template_file, 'r').read() 44​trigger_rules_template = open(rules_template_file, 'r').read()