This will be useful when the latest trigger is deployed in prod (with dockerautotest and abicheck) but distgit style tasks won't be ready yet officially.
Also contains a diff for 'libabigail has been renamed to abicheck'
Note that functional tests does not work due to T800, will send patch for that later.
Tested manually, worked.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | conf/trigger.cfg.example (2 lines) | |||
| M | jobtriggers/config.py (6 lines) | |||
| M | jobtriggers/koji_build_msg.py (8 lines) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| 80a270bfff2e | 3dff23e28c0f | ba239842ff82 | Martin Krizek | Allow enabling distgit style tasks in config | May 24 2016, 12:30 PM |
| ba239842ff82 | 79e196660013 | c45aa7a88ff0 | Martin Krizek | libabigail has been renamed to abicheck | May 24 2016, 11:00 AM |
| Show All 14 Lines | |||||
| 15 | joblog_file = /var/log/taskotron-trigger/jobs.csv | 15 | joblog_file = /var/log/taskotron-trigger/jobs.csv | ||
| 16 | fuse_delay = 1000 ; seconds | 16 | fuse_delay = 1000 ; seconds | ||
| 17 | 17 | | |||
| 18 | [distgit] | 18 | [distgit] | ||
| 19 | cache_dir = /var/lib/taskotron-trigger/cache | 19 | cache_dir = /var/lib/taskotron-trigger/cache | ||
| 20 | repo_url = http://pkgs.fedoraproject.org/git | 20 | repo_url = http://pkgs.fedoraproject.org/git | ||
| 21 | namespace = rpms-checks | 21 | namespace = rpms-checks | ||
| 22 | 22 | | |||
| 23 | [libabigail] | 23 | [abicheck] | ||
| 24 | critpath_filepath = /var/lib/taskotron-trigger/critpath_whitelist | 24 | critpath_filepath = /var/lib/taskotron-trigger/critpath_whitelist | ||
| 25 | critpath_exclude = | 25 | critpath_exclude = | ||
| Show All 18 Lines | |||||
| 19 | joblog_file = /var/log/taskotron-trigger/jobs.csv | 19 | joblog_file = /var/log/taskotron-trigger/jobs.csv | ||
| 20 | fuse_delay = 1000 ; seconds | 20 | fuse_delay = 1000 ; seconds | ||
| 21 | 21 | | |||
| 22 | [distgit] | 22 | [distgit] | ||
| 23 | cache_dir = /var/lib/taskotron-trigger/cache | 23 | cache_dir = /var/lib/taskotron-trigger/cache | ||
| 24 | repo_url = http://pkgs.fedoraproject.org/git | 24 | repo_url = http://pkgs.fedoraproject.org/git | ||
| 25 | namespace = rpms-checks | 25 | namespace = rpms-checks | ||
| 26 | 26 | | |||
| 27 | [libabigail] | 27 | [abicheck] | ||
| 28 | critpath_filepath = /var/lib/taskotron-trigger/critpath_whitelist | 28 | critpath_filepath = /var/lib/taskotron-trigger/critpath_whitelist | ||
| 29 | critpath_exclude = | 29 | critpath_exclude = | ||
| 30 | """ | 30 | """ | ||
| 31 | 31 | | |||
| 32 | config = ConfigParser.ConfigParser() | 32 | config = ConfigParser.ConfigParser() | ||
| 33 | config.readfp(io.BytesIO(defaults)) | 33 | config.readfp(io.BytesIO(defaults)) | ||
| 34 | config.read(['/etc/taskotron/trigger.cfg', './conf/trigger.cfg']) | 34 | config.read(['/etc/taskotron/trigger.cfg', './conf/trigger.cfg']) | ||
| 35 | 35 | | |||
| Show All 12 Lines | |||||
| 48 | job_logging = True if config.get('trigger', 'job_logging') == 'True' else False | 48 | job_logging = True if config.get('trigger', 'job_logging') == 'True' else False | ||
| 49 | joblog_file = config.get('trigger', 'joblog_file') | 49 | joblog_file = config.get('trigger', 'joblog_file') | ||
| 50 | fuse_delay = int(config.get('trigger', 'fuse_delay')) # seconds | 50 | fuse_delay = int(config.get('trigger', 'fuse_delay')) # seconds | ||
| 51 | 51 | | |||
| 52 | distgit_cache_dir = config.get('distgit', 'cache_dir') | 52 | distgit_cache_dir = config.get('distgit', 'cache_dir') | ||
| 53 | distgit_repo_url = config.get('distgit', 'repo_url') | 53 | distgit_repo_url = config.get('distgit', 'repo_url') | ||
| 54 | distgit_namespace = config.get('distgit', 'namespace') | 54 | distgit_namespace = config.get('distgit', 'namespace') | ||
| 55 | 55 | | |||
| 56 | critpath_filepath = config.get('libabigail', 'critpath_filepath') | 56 | critpath_filepath = config.get('abicheck', 'critpath_filepath') | ||
| 57 | critpath_exclude = [e.strip() for e in config.get('libabigail', 'critpath_exclude').split(',') if e] | 57 | critpath_exclude = [e.strip() for e in config.get('abicheck', 'critpath_exclude').split(',') if e] | ||
| Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Line(s) | 36 | def trigger_tasks(msg, f): | |||
|---|---|---|---|---|---|
| 55 | 55 | | |||
| 56 | # run docker-specific tasks here - e. g. dockerautotest | 56 | # run docker-specific tasks here - e. g. dockerautotest | ||
| 57 | if name == "docker": | 57 | if name == "docker": | ||
| 58 | f('-'.join((name, version, release)), | 58 | f('-'.join((name, version, release)), | ||
| 59 | ITEM_TYPE, | 59 | ITEM_TYPE, | ||
| 60 | config.docker_build_tasks, | 60 | config.docker_build_tasks, | ||
| 61 | config.valid_arches) | 61 | config.valid_arches) | ||
| 62 | 62 | | |||
| 63 | # run libabigail task here | 63 | # run abicheck task here | ||
| 64 | critpath = utils.parse_yaml_from_file(config.critpath_filepath) | 64 | critpath = utils.parse_yaml_from_file(config.critpath_filepath) | ||
| 65 | critpath_pkgs = critpath['pkgs'].get(branch, critpath['pkgs']['master']) | 65 | critpath_pkgs = critpath['pkgs'].get(branch, critpath['pkgs']['master']) | ||
| 66 | libabigail_whitelist = set(critpath_pkgs) - set(config.critpath_exclude) | 66 | abicheck_whitelist = set(critpath_pkgs) - set(config.critpath_exclude) | ||
| 67 | 67 | | |||
| 68 | if name in libabigail_whitelist: | 68 | if name in abicheck_whitelist: | ||
| 69 | f('-'.join((name, version, release)), | 69 | f('-'.join((name, version, release)), | ||
| 70 | ITEM_TYPE, | 70 | ITEM_TYPE, | ||
| 71 | ['libabigail'], | 71 | ['abicheck'], | ||
| 72 | config.valid_arches) | 72 | config.valid_arches) | ||
| 73 | 73 | | |||
| 74 | 74 | | |||
| 75 | class KojiBuildCompletedJobTrigger(JobTrigger): | 75 | class KojiBuildCompletedJobTrigger(JobTrigger): | ||
| 76 | topic = "org.fedoraproject.prod.buildsys.build.state.change" | 76 | topic = "org.fedoraproject.prod.buildsys.build.state.change" | ||
| 77 | jsonify = False | 77 | jsonify = False | ||
| 78 | config_key = 'taskotron.kojibuildcompletedjobtrigger.enabled' | 78 | config_key = 'taskotron.kojibuildcompletedjobtrigger.enabled' | ||
| 79 | 79 | | |||
| Show All 12 Lines | |||||