Differential D24

Package taskotron trigger as RPM
ClosedPublic
Actions

Authored by mkrizek on Mar 11 2014, 3:12 PM.

Details

Reviewers
tflink
Maniphest Tasks
T93: package taskotron trigger as rpm
Commits
rTRGR34086961626e: Package taskotron trigger as RPM
Summary

Add specfile for taskotron trigger. This also moves files around in a way that is more suitable for packaging. Note that this does not change any actual code, which will be done separately in other tasks. Fixes T93.

Test Plan

Build an rpm from the specfile, install it and run fedmsg-hub.

Diff Detail

Branch
feature/packaging
Lint
No Linters Available
Unit
No Unit Test Coverage
tflink accepted this revision.Mar 11 2014, 8:31 PM

I had forgotten how much of a mess that code was. Thanks for cleaning it up and making things a bit saner.

Looks good to me

mkrizek closed this revision.Mar 12 2014, 10:23 AM

Revision Contents

Diff 71

View Options

config.py

  • This file was added.
1​config = {'taskotron.kojijobtrigger.enabled': True}
View Options

fedmsg.conf

  • This file was deleted.
This file was completely deleted. Show File Contents
View Options

jobtrigger.py

  • This file was deleted.
This file was completely deleted. Show File Contents
View Options

jobtriggers/__init__.py

  • This file was added.
This is an empty file.
View Options

jobtriggers/koji.py

  • This file was moved from triggerjob.py.
1import requests 1​import requests
2import ConfigParser 2​import ConfigParser
3 3​
4import fedmsg 4​import fedmsg
5import fedmsg.encoding 5​import fedmsg.encoding
6import fedmsg.consumers 6​import fedmsg.consumers
7 7​
8class JobTrigger(fedmsg.consumers.FedmsgConsumer): 8​class KojiJobTrigger(fedmsg.consumers.FedmsgConsumer):
9 topic = "org.fedoraproject.prod.buildsys.tag" 9​ topic = "org.fedoraproject.prod.buildsys.tag"
10 jsonify = False 10​ jsonify = False
11 config_key = 'taskotron.jobtrigger.enabled' 11​ config_key = 'taskotron.kojijobtrigger.enabled'
12 12​
13 def consume(self, message): 13​ def consume(self, message):
14 usable_message = fedmsg.encoding.loads(message.body) 14​ usable_message = fedmsg.encoding.loads(message.body)
15 15​
16 buildname = usable_message['msg']['name'] 16​ buildname = usable_message['msg']['name']
17 buildversion = usable_message['msg']['version'] 17​ buildversion = usable_message['msg']['version']
18 buildrelease = usable_message['msg']['release'] 18​ buildrelease = usable_message['msg']['release']
19 19​
Show All 29 Lines
View Options

setup.py

1from setuptools import setup, Command 1​from setuptools import setup
2import codecs ​
3import re ​
4import os 2​import os
5 3​
6here = os.path.abspath(os.path.dirname(__file__)) 4​here = os.path.abspath(os.path.dirname(__file__))
7 5​
8 6​
9setup(name='triggerjobs', 7​setup(
10 version='0.0.9', 8​ name='jobtriggers',
11 description='triggering jobs via fedmsg', 9​ version='0.0.9',
12 author='Tim Flink', 10​ description='triggering jobs via fedmsg',
13 author_email='tflink@fedoraproject.org', 11​ author='Tim Flink',
14 license='GPLv2+', 12​ author_email='tflink@fedoraproject.org',
15 url='https://fedorahosted.org/fedora-qa', 13​ license='GPLv2+',
16 entry_points= { 14​ url='https://fedorahosted.org/fedora-qa',
15​ packages=['jobtriggers'],
16​ entry_points={
17 'moksha.consumer': ( 17​ 'moksha.consumer': (
18 'jobtrigger = triggerjob:JobTrigger', 18​ 'kojijobtrigger = jobtriggers.koji:KojiJobTrigger',
19 ), 19​ ),
20 }, 20​ },
21 include_package_data=True, 21​ include_package_data=True,
22 install_requires = [ 22​ install_requires=[
23 'moksha.hub', 23​ 'moksha.hub',
24 'fedmsg', 24​ 'fedmsg',
25 'requests' 25​ 'requests',
26 ] 26​ ]
27 ) 27​)
View Options

taskotron-trigger.spec

  • This file was added.
1​Name: taskotron-trigger
2​Version: 0.0.9
3​Release: 1%{?dist}
4​Summary: Triggering Taskotron jobs via fedmsg.
5​
6​License: GPLv2+
7​URL: https://fedorahosted.org/fedora-qa
8​Source0: %{name}-%{version}.tar.gz
9​
10​BuildArch: noarch
11​
12​BuildRequires: python-setuptools
13​Requires: fedmsg
14​Requires: fedmsg-hub
15​
16​%description
17​Triggering Taskotron jobs via fedmsg.
18​
19​
20​%prep
21​%setup -q
22​
23​
24​%build
25​%{__python} setup.py build
26​
27​
28​%install
29​rm -rf $RPM_BUILD_ROOT
30​%{__python} setup.py install -O1 --skip-build --root %{buildroot}
31​
32​# configuration file
33​mkdir -p %{buildroot}%{_sysconfdir}/%{name}
34​install config.ini.example %{buildroot}%{_sysconfdir}/%{name}/config.ini.example
35​mkdir -p %{buildroot}%{_sysconfdir}/fedmsg.d/
36​install config.py %{buildroot}%{_sysconfdir}/fedmsg.d/taskotron-trigger.py
37​
38​
39​%files
40​%doc readme.rst
41​%{python_sitelib}/*
42​
43​%dir %{_sysconfdir}/%{name}
44​%{_sysconfdir}/%{name}/*
45​%{_sysconfdir}/fedmsg.d/taskotron-trigger.py*
46​
47​
48​%changelog
49​* Mon Mar 10 2014 Martin Krizek <mkrizek@fedoraproject.org> - 0.0.9-1
50​- Initial packaging
View Options

triggerjob.py

  • This file was moved to jobtriggers/koji.py.