Differential D776

Add report templates into the package and spec file
ClosedPublic
Actions

Authored by mkrizek on Mar 14 2016, 9:51 AM.

Details

Reviewers
kparal
tflink
jskladan
Maniphest Tasks
T740: Report templates are not installed via rpm
Commits
rLTRNd55630e0b614: Add report templates into the package and spec file
Test Plan

Built and installed rpm, generated html report for rpmlint. Worked for me.

Diff Detail

Repository
rLTRN libtaskotron
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
mkrizek retitled this revision from to Add report templates into the package and spec file.Mar 14 2016, 9:51 AM
mkrizek updated this object.
mkrizek edited the test plan for this revision. (Show Details)
mkrizek added reviewers: tflink, kparal, jskladan.
kparal accepted this revision.Mar 14 2016, 1:11 PM

I haven't tested it but looks OK to me.

libtaskotron.spec
129

Why not add the whole directory?

This revision is now accepted and ready to land.Mar 14 2016, 1:11 PM
Closed by commit rLTRNd55630e0b614: Add report templates into the package and spec file (authored by mkrizek). · Explain WhyMar 15 2016, 12:57 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 1996

View Options

libtaskotron.spec

1# sitelib for noarch packages, sitearch for others (remove the unneeded one) 1​# sitelib for noarch packages, sitearch for others (remove the unneeded one)
2%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} 2​%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
3%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} 3​%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
4 4​
5Name: libtaskotron 5​Name: libtaskotron
6Version: 0.4.10 6​Version: 0.4.10
7Release: 1%{?dist} 7​Release: 2%{?dist}
8Summary: Taskotron Support Library 8​Summary: Taskotron Support Library
9 9​
10License: GPLv3 10​License: GPLv3
11URL: https://bitbucket.org/fedoraqa/libtaskotron 11​URL: https://bitbucket.org/fedoraqa/libtaskotron
12Source0: http://qadevel.fedoraproject.org/releases/%{name}/%{name}-%{version}.tar.gz 12​Source0: http://qadevel.fedoraproject.org/releases/%{name}/%{name}-%{version}.tar.gz
13 13​
14BuildArch: noarch 14​BuildArch: noarch
15 15​
▲ Show 20 Lines • Show All 105 Lines • ▼ Show 20 Line(s)
121 121​
122%files 122​%files
123 123​
124%files -n libtaskotron-core 124​%files -n libtaskotron-core
125%doc readme.rst LICENSE 125​%doc readme.rst LICENSE
126%{python_sitelib}/libtaskotron/*.py* 126​%{python_sitelib}/libtaskotron/*.py*
127%{python_sitelib}/libtaskotron/directives/*.py* 127​%{python_sitelib}/libtaskotron/directives/*.py*
128%{python_sitelib}/libtaskotron/ext/*.py* 128​%{python_sitelib}/libtaskotron/ext/*.py*
129​%{python_sitelib}/libtaskotron/report_templates/*.j2
kparalUnsubmitted
Not Done

Why not add the whole directory?

129%{python_sitelib}/*.egg-info 130​%{python_sitelib}/*.egg-info
130 131​
131%dir %{python_sitelib}/libtaskotron/ext/fedora 132​%dir %{python_sitelib}/libtaskotron/ext/fedora
132%dir %{python_sitelib}/libtaskotron/ext 133​%dir %{python_sitelib}/libtaskotron/ext
133%dir %{python_sitelib}/libtaskotron/directives 134​%dir %{python_sitelib}/libtaskotron/directives
135​%dir %{python_sitelib}/libtaskotron/report_templates
134 136​
135%attr(755,root,root) %{_bindir}/runtask 137​%attr(755,root,root) %{_bindir}/runtask
136 138​
137%dir %attr(777, root, root) %{_localstatedir}/log/taskotron 139​%dir %attr(777, root, root) %{_localstatedir}/log/taskotron
138%dir %attr(777, root, root) %{_tmppath}/taskotron 140​%dir %attr(777, root, root) %{_tmppath}/taskotron
139%dir %attr(777, root, root) %{_sharedstatedir}/taskotron/artifacts 141​%dir %attr(777, root, root) %{_sharedstatedir}/taskotron/artifacts
140%dir %attr(777, root, root) %{_localstatedir}/cache/taskotron 142​%dir %attr(777, root, root) %{_localstatedir}/cache/taskotron
141%dir %attr(777, root, root) %{_sharedstatedir}/taskotron/images 143​%dir %attr(777, root, root) %{_sharedstatedir}/taskotron/images
142 144​
143%files -n libtaskotron-config 145​%files -n libtaskotron-config
144%dir %{_sysconfdir}/taskotron 146​%dir %{_sysconfdir}/taskotron
145%config(noreplace) %{_sysconfdir}/taskotron/taskotron.yaml 147​%config(noreplace) %{_sysconfdir}/taskotron/taskotron.yaml
146%config %{_sysconfdir}/taskotron/yumrepoinfo.conf 148​%config %{_sysconfdir}/taskotron/yumrepoinfo.conf
147 149​
148%files -n libtaskotron-fedora 150​%files -n libtaskotron-fedora
149%dir %{python_sitelib}/libtaskotron/ext/fedora 151​%dir %{python_sitelib}/libtaskotron/ext/fedora
150%{python_sitelib}/libtaskotron/ext/fedora/* 152​%{python_sitelib}/libtaskotron/ext/fedora/*
151 153​
152%files -n libtaskotron-disposable 154​%files -n libtaskotron-disposable
153%dir %{python_sitelib}/libtaskotron/ext/disposable 155​%dir %{python_sitelib}/libtaskotron/ext/disposable
154%{python_sitelib}/libtaskotron/ext/disposable/* 156​%{python_sitelib}/libtaskotron/ext/disposable/*
155 157​
156%changelog 158​%changelog
159​* Mon Mar 14 2016 Martin Krizek <mkrizek@fedoraproject.org> - 0.4.10-2
160​- add report_templates directory
161​
157* Thu Mar 03 2016 Martin Krizek <mkrizek@fedoraproject.org> - 0.4.10-1 162​* Thu Mar 03 2016 Martin Krizek <mkrizek@fedoraproject.org> - 0.4.10-1
158- various performance fixes in disposable clients 163​- various performance fixes in disposable clients
159 164​
160* Sun Feb 07 2016 Tim Flink <tflink@fedoraproject.org> - 0.4.9-1 165​* Sun Feb 07 2016 Tim Flink <tflink@fedoraproject.org> - 0.4.9-1
161- add report directive (D735) 166​- add report directive (D735)
162- restructure docs (D734) 167​- restructure docs (D734)
163 168​
164* Thu Jan 28 2016 Martin Krizek <mkrizek@redhat.com> - 0.4.8-2 169​* Thu Jan 28 2016 Martin Krizek <mkrizek@redhat.com> - 0.4.8-2
▲ Show 20 Lines • Show All 177 Lines • Show Last 20 Lines
View Options

libtaskotron/directives/create_report_directive.py

Show First 20 Lines • Show All 63 Lines • ▼ Show 20 Line(s)
64from libtaskotron import check 64​from libtaskotron import check
65from libtaskotron import file_utils 65​from libtaskotron import file_utils
66from libtaskotron.exceptions import TaskotronDirectiveError, TaskotronValueError 66​from libtaskotron.exceptions import TaskotronDirectiveError, TaskotronValueError
67from libtaskotron.logger import log 67​from libtaskotron.logger import log
68 68​
69 69​
70directive_class = 'CreateReportDirective' 70​directive_class = 'CreateReportDirective'
71 71​
72TEMPL_DIR = 'libtaskotron/report_templates' ​
73 ​
74 72​
75class CreateReportDirective(BaseDirective): 73​class CreateReportDirective(BaseDirective):
76 74​
77 def process(self, params, arg_data): 75​ def process(self, params, arg_data):
78 try: 76​ try:
79 check_details = check.import_YAML(params['results']) 77​ check_details = check.import_YAML(params['results'])
80 log.debug("YAML output parsed OK.") 78​ log.debug("YAML output parsed OK.")
81 except TaskotronValueError as e: 79​ except TaskotronValueError as e:
Show All 16 Lines95 if 'path' in params:
98 report_fname = os.path.join(arg_data['artifactsdir'], params['path']) 96​ report_fname = os.path.join(arg_data['artifactsdir'], params['path'])
99 else: 97​ else:
100 report_fname = os.path.join(arg_data['artifactsdir'], 'report.html') 98​ report_fname = os.path.join(arg_data['artifactsdir'], 'report.html')
101 99​
102 if 'template' in params: 100​ if 'template' in params:
103 template_fname = os.path.join(os.path.dirname(arg_data['task']), 101​ template_fname = os.path.join(os.path.dirname(arg_data['task']),
104 params['template']) 102​ params['template'])
105 else: 103​ else:
106 template_fname = os.path.join(TEMPL_DIR, 'html.j2') 104​ template_fname = os.path.join(os.path.dirname(os.path.abspath(__file__)),
105​ '../report_templates/html.j2')
107 106​
108 try: 107​ try:
109 file_utils.makedirs(os.path.dirname(report_fname)) 108​ file_utils.makedirs(os.path.dirname(report_fname))
110 except OSError, e: 109​ except OSError, e:
111 raise TaskotronDirectiveError(e) 110​ raise TaskotronDirectiveError(e)
112 111​
113 with open(template_fname) as f_template: 112​ with open(template_fname) as f_template:
114 with open(report_fname, 'w') as f_report: 113​ with open(report_fname, 'w') as f_report:
115 template = jinja2.Template(f_template.read()) 114​ template = jinja2.Template(f_template.read())
116 report = template.render(results=results, 115​ report = template.render(results=results,
117 artifactsdir=arg_data['artifactsdir']) 116​ artifactsdir=arg_data['artifactsdir'])
118 f_report.write(report) 117​ f_report.write(report)
119 118​
120 log.info('Report generated in: %s', os.path.abspath(report_fname)) 119​ log.info('Report generated in: %s', os.path.abspath(report_fname))
View Options

setup.py

Show All 33 Lines33setup(name='libtaskotron',
34 version=find_version('libtaskotron', '__init__.py'), 34​ version=find_version('libtaskotron', '__init__.py'),
35 description='base lib for taskotron jobs', 35​ description='base lib for taskotron jobs',
36 author='Tim Flink', 36​ author='Tim Flink',
37 author_email='tflink@fedoraproject.org', 37​ author_email='tflink@fedoraproject.org',
38 license='GPLv2+', 38​ license='GPLv2+',
39 url='https://bitbucket.org/fedoraqa/libtaskotron', 39​ url='https://bitbucket.org/fedoraqa/libtaskotron',
40 packages=['libtaskotron', 'libtaskotron.directives', 'libtaskotron.ext', 40​ packages=['libtaskotron', 'libtaskotron.directives', 'libtaskotron.ext',
41 'libtaskotron.ext.fedora', 'libtaskotron.ext.disposable'], 41​ 'libtaskotron.ext.fedora', 'libtaskotron.ext.disposable'],
42​ package_data={'libtaskotron': ['report_templates/*.j2']},
42 package_dir={'libtaskotron':'libtaskotron'}, 43​ package_dir={'libtaskotron':'libtaskotron'},
43 include_package_data=True, 44​ include_package_data=True,
44 cmdclass={'test': PyTest}, 45​ cmdclass={'test': PyTest},
45 entry_points=dict(console_scripts=['runtask=libtaskotron.main:main']), 46​ entry_points=dict(console_scripts=['runtask=libtaskotron.main:main']),
46 install_requires = [ 47​ install_requires = [
47 'PyYAML', 48​ 'PyYAML',
48 ] 49​ ]
49) 50​)