Differential D551

simple-minded install of systemd units
ClosedPublic
Actions

Authored by adamwill on Sep 2 2015, 4:58 PM.

Details

Reviewers
garretraziel
jskladan
Commits
rOPENQAbee94e01b61f: simple-minded install of systemd units
Summary

This works, but with some caveats. It won't work with any path
other than /usr/bin for the executable (there's no step where
you can substitute another bindir into the .service files) and
there is no uninstall possible. You can use 'pip uninstall' to
remove things installed with 'setup.py install', but this won't
catch stuff installed via data_files; if you 'pip uninstall
fedora-openqa' the systemd files stick around.

The alternative would be to set up a Makefile, I guess, which
would puppet setup.py. I'm not sure how desirable that is and
how much we care about the above issues.

Test Plan

Check this actually works as described in README.md.

Diff Detail

Repository
rOPENQA fedora_openqa
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
adamwill retitled this revision from to simple-minded install of systemd units.Sep 2 2015, 4:58 PM
adamwill updated this object.
adamwill edited the test plan for this revision. (Show Details)
adamwill added reviewers: jskladan, garretraziel.
garretraziel accepted this revision.Sep 3 2015, 10:17 AM

I don't see a problem with this solution. I think that we would only mimic setup.py behaviour by creating our own Makefile.

README.md
98

I think that we should also notice user that he need to either reboot or run sudo systemctl start openqa-trigger-current.timer.

setup.py
36

I know that it would be more verbose, but I'd rather copy only *.service and *.timer files, I would use glob.glob('systemd/*.{service,timer}') or something.

This revision is now accepted and ready to land.Sep 3 2015, 10:17 AM
Closed by commit rOPENQAbee94e01b61f: simple-minded install of systemd units (authored by adamwill). · Explain WhySep 3 2015, 8:00 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathPackages
MREADME.md (28 lines)
Msetup.py (7 lines)

Diff 1443

View Options

README.md

Show First 20 Lines • Show All 86 Lines • ▼ Show 20 Line(s)
87have them, and install: 87​have them, and install:
88 88​
89 git clone https://bitbucket.org/rajcze/openqa_fedora_tools 89​ git clone https://bitbucket.org/rajcze/openqa_fedora_tools
90 cd openqa_fedora_tools; sudo python setup.py install 90​ cd openqa_fedora_tools; sudo python setup.py install
91 cd .. 91​ cd ..
92 92​
937. Set up systemd services and timer: 93​7. Set up systemd services and timer:
94 94​
95 To run openQA periodically, you have to copy systemd files into appropriate 95​ To run openQA periodically, you have to enable its services:
96 location and enable its services: ​
97 ​
98 cd openqa_fedora_tools/systemd ​
99 sudo cp openqa-trigger@.service openqa-trigger-current.timer /etc/systemd/system/ ​
100 ​
101 reload all daemons ​
102 96​
103 sudo systemctl daemon-reload 97​ sudo systemctl daemon-reload
104 ​
105 enable services ​
106 ​
107 sudo systemctl enable openqa-trigger-current.timer 98​ sudo systemctl enable openqa-trigger-current.timer
garretrazielUnsubmitted
Not Done

I think that we should also notice user that he need to either reboot or run sudo systemctl start openqa-trigger-current.timer.

108 99​
109 This will run `fedora-openqa-schedule current` hourly. In this mode, if 100​ This will run `fedora-openqa-schedule current` hourly. In this mode, if
110 the 'current' validation compose has changed since the last time the 101​ the 'current' validation compose has changed since the last time the
111 command was run (and on the very first run), the new one will be 102​ command was run (and on the very first run), the new one will be
112 downloaded, test jobs will be scheduled, and results reported to the wiki 103​ downloaded, test jobs will be scheduled, and results reported to the wiki
113 on completion. If the 'current' validation compose has not changed, nothing 104​ on completion. If the 'current' validation compose has not changed, nothing
114 will happen. 105​ will happen.
115 106​
116 [docker] if you are running openQA in Docker, you have to copy and enable 107​ [docker] if you are running openQA in Docker, you have to enable additional
117 additional service files: 108​ service files:
118 109​
119 sudo cp openqa-data.service openqa-webui.service openqa-worker@.service /etc/systemd/system ​
120 sudo systemctl daemon-reload ​
121 sudo systemctl enable openqa-data.service 110​ sudo systemctl enable openqa-data.service
122 sudo systemctl enable openqa-webui.service 111​ sudo systemctl enable openqa-webui.service
123 sudo systemctl enable openqa-worker@1.service 112​ sudo systemctl enable openqa-worker@1.service
124 113​
125 When running under Docker, you will also probably want to change the 114​ When running under Docker, you will also probably want to change the
126 directory Fedora ISOs are downloaded to (so they are downloaded to the 115​ directory Fedora ISOs are downloaded to (so they are downloaded to the
127 directory where the openQA Docker container will look for them) by 116​ directory where the openQA Docker container will look for them) by
128 creating `/etc/fedora-openqa/schedule.conf` with the following content: 117​ creating `/etc/fedora-openqa/schedule.conf` with the following content:
129 118​
130 [schedule] 119​ [schedule]
131 iso_path = /PATH/TO/PREVIOUSLY/CREATED/data/factory/iso/ 120​ iso_path = /PATH/TO/PREVIOUSLY/CREATED/data/factory/iso/
132 121​
133 If you wish to run `openqa-fedora-schedule` jobs as a different user, edit 122​ If you wish to run `openqa-fedora-schedule` jobs as a different user, copy
134 `/etc/systemd/system/openqa-trigger@.service` and set `User=` correctly. 123​ `/usr/lib/systemd/system/openqa-trigger@.service` to `/etc/systemd/system`
135 Ensure the chosen user has a `~/.fedora/credentials` file and either has 124​ and set `User=` correctly. Ensure the chosen user has a
136 a `~/.config/openqa/client.conf` file or can read 125​ `~/.fedora/credentials` file and either has a
137 `/etc/openqa/client.conf` (and, if you are using it, `schedule.conf`). 126​ `~/.config/openqa/client.conf` file or can read `/etc/openqa/client.conf`
127​ (and, if you are using it, `schedule.conf`).
138 128​
139As well as the scheduled 'current' run, you can run `fedora-openqa-schedule` 129​As well as the scheduled 'current' run, you can run `fedora-openqa-schedule`
140manually to run tests on a specified Fedora compose/release. See the command's 130​manually to run tests on a specified Fedora compose/release. See the command's
141help for further details. 131​help for further details.
View Options

setup.py

1​import glob
1import os 2​import os
2from setuptools import setup, find_packages 3​from setuptools import setup, find_packages
3 4​
4# Utility function to read the README file. 5​# Utility function to read the README file.
5# Used for the long_description. It's nice, because now 1) we have a top level 6​# Used for the long_description. It's nice, because now 1) we have a top level
6# README file and 2) it's easier to type in the README file than to put a raw 7​# README file and 2) it's easier to type in the README file than to put a raw
7# string in below. Stolen from 8​# string in below. Stolen from
8# https://pythonhosted.org/an_example_pypi_project/setuptools.html 9​# https://pythonhosted.org/an_example_pypi_project/setuptools.html
9def read(fname): 10​def read(fname):
10 return open(os.path.join(os.path.dirname(__file__), fname)).read() 11​ return open(os.path.join(os.path.dirname(__file__), fname)).read()
11 12​
13​# Allow modification of systemd install location via env var.
14​SYSTEMDUNITPATH = os.getenv("SYSTEMDUNITPATH", '/usr/lib/systemd/system')
15​
12setup( 16​setup(
13 name = "fedora-openqa", 17​ name = "fedora-openqa",
14 version = "1.0", 18​ version = "1.0",
15 entry_points = {'console_scripts': ['fedora-openqa-schedule = fedora_openqa_schedule.cli:main'],}, 19​ entry_points = {'console_scripts': ['fedora-openqa-schedule = fedora_openqa_schedule.cli:main'],},
16 author = "Fedora QA devel team", 20​ author = "Fedora QA devel team",
17 author_email = "qa-devel@lists.fedoraproject.org", 21​ author_email = "qa-devel@lists.fedoraproject.org",
18 description = "Fedora openQA scheduler", 22​ description = "Fedora openQA scheduler",
19 license = "GPLv3+", 23​ license = "GPLv3+",
20 keywords = "fedora openqa test qa", 24​ keywords = "fedora openqa test qa",
21 url = "https://bitbucket.org/rajcze/openqa_fedora_tools", 25​ url = "https://bitbucket.org/rajcze/openqa_fedora_tools",
22 packages = ["fedora_openqa_schedule"], 26​ packages = ["fedora_openqa_schedule"],
23 install_requires = ['fedfind>=1.5', 'openqa-client', 'setuptools', 'six', 'urlgrabber'], 27​ install_requires = ['fedfind>=1.5', 'openqa-client', 'setuptools', 'six', 'urlgrabber'],
24 long_description=read('README.md'), 28​ long_description=read('README.md'),
25 classifiers=[ 29​ classifiers=[
26 "Development Status :: 3 - Alpha", 30​ "Development Status :: 3 - Alpha",
27 "Topic :: Utilities", 31​ "Topic :: Utilities",
28 "License :: OSI Approved :: GNU General Public License v3 or later " 32​ "License :: OSI Approved :: GNU General Public License v3 or later "
29 "(GPLv3+)", 33​ "(GPLv3+)",
30 ], 34​ ],
35​ data_files=[
36​ (SYSTEMDUNITPATH, glob.glob('systemd/*.service') + glob.glob('systemd/*.timer')),
garretrazielUnsubmitted
Not Done

I know that it would be more verbose, but I'd rather copy only *.service and *.timer files, I would use glob.glob('systemd/*.{service,timer}') or something.

37​ ],
31) 38​)