Skip to content

Commit a4c1f4d

Browse files
committed
- Add service file and start service
- Speed up mock via no cache clean via fedberry-24-armv6l.cfg. - Mock: use DNF instead of yum. - Register agent on start up.
1 parent 01d3240 commit a4c1f4d

5 files changed

Lines changed: 59 additions & 5 deletions

File tree

config/fedberry-24-armv6l.cfg

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils s
66
config_opts['dist'] = 'fc24' # only useful for --resultdir variable subst
77
config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
88
config_opts['releasever'] = '24'
9-
config_opts['resultdir'] = "/home/build/fc24"
10-
#config_opts['package_manager'] = 'dnf'
9+
config_opts['package_manager'] = 'dnf'
10+
config_opts['cleanup_on_success'] = False
11+
config_opts['cleanup_on_failure'] = False
1112

1213
config_opts['mydist'] = ''
1314
config_opts['macros']['%vendor']="FedBerry"

config/mock-client.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
MOCK_SERVER=http://mock.fedberry.org/
22
INTERFACE=usb0
3+
MOCK_CONFIG="fedberry-24-armv6l"
4+
MOCK_OPTIONS="--no-clean --no-cleanup-after --nocheck"

mock-client.service

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[Unit]
2+
Description=Mock client service
3+
After=syslog.target
4+
5+
[Service]
6+
Type=forking
7+
PIDFile=/var/run/mock-client.pid
8+
ExecStart=/usr/bin/mock-client
9+
ExecStop=/bin/rm -f /var/run/mock-client.pid
10+
User=mockclient
11+
Group=mock
12+
Restart=on-failure
13+
14+
[Install]
15+
WantedBy=multi-user.target

mock-client.spec

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Name: mock-client
2-
Version: 0.1.1
2+
Version: 0.2.0
33
Release: 1%{?dist}
44
Summary: Mock.fedberry.org agent to run builds.
55

@@ -10,7 +10,11 @@ BuildArch: noarch
1010
ExclusiveArch: %{nodejs_arches} noarch
1111

1212
BuildRequires: nodejs-packaging
13+
BuildRequires: systemd
1314

15+
Requires(post): systemd
16+
Requires(preun): systemd
17+
Requires(postun): systemd
1418
Requires: mock
1519

1620
Requires(pre): /usr/sbin/useradd, /usr/bin/getent
@@ -21,11 +25,29 @@ Small and light nodejs based agent to run tasks from http://mock.fedberry.org
2125

2226

2327
%pre
24-
/usr/bin/getent passwd mockclient || /usr/sbin/useradd -r -d /home/mockclient -s /bin/bash mockclient -g mock
28+
/usr/bin/getent passwd mockclient || /usr/sbin/useradd -mNr -d /home/mockclient -s /bin/bash mockclient -g mock
29+
30+
%post
31+
32+
echo "Registering agent on http://mock.fedberry.org"
33+
/usr/bin/mock-client-register
34+
35+
#init enviorment
36+
echo "Init fedberry-24-armv6l Env."
37+
su -l mockclient -c 'mock -r fedberry-24-armv6l --init'
38+
39+
%systemd_post mock-client.service
40+
41+
42+
%preun
43+
%systemd_preun mock-client.service
2544

2645
%postun
46+
%systemd_postun_with_restart mock-client.service
2747
/usr/sbin/userdel -fr mockclient
2848

49+
50+
2951
%prep
3052
%setup -q -n mock-client-%{version}
3153

@@ -48,6 +70,8 @@ cp config/fedberry-24-armv6l.cfg %{buildroot}/%{_sysconfdir}/mock/
4870
mkdir -p %{buildroot}/%{_sysconfdir}/mock-client
4971
cp config/mock-client.config %{buildroot}/%{_sysconfdir}/mock-client/
5072

73+
cp mock-client.service %{buildroot}%{_unitdir}/mock-client.service
74+
5175
%nodejs_symlink_deps
5276

5377

@@ -59,8 +83,20 @@ cp config/mock-client.config %{buildroot}/%{_sysconfdir}/mock-client/
5983
%{_sysconfdir}/mock/fedberry-24-armv6l.cfg
6084
%{_sysconfdir}/mock-client
6185
%{_sysconfdir}/mock-client/mock-client.config
86+
%{_unitdir}/mock-client.service
6287

6388
%changelog
89+
* Nov Nov 7 2016 Gor Martsen <gor@fedberry.org> - 0.2.0-1
90+
- Add service file and start service
91+
- Speed up mock via no cache clean via fedberry-24-armv6l.cfg.
92+
- Mock: use DNF instead of yum.
93+
- Register agent on start up.
94+
95+
* Fri Nov 4 2016 Gor Martsen <gor@fedberry.org> - 0.1.2-1
96+
- Add mockclient user with mock group.
97+
- Add requires on mock package.
98+
- auto register on mock.fedberry.org.
99+
64100
* Thu Nov 3 2016 Gor Martsen <gor@fedberry.org> - 0.1.1-1
65101
- Add /etc/mock-client/mock-client.config file.
66102
- fix shabang and bin permissions

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mock-client",
3-
"version": "0.1.0",
3+
"version": "0.2.0",
44
"description": "Collect status tasks and post to github status api",
55
"main": "mock-client.js",
66
"scripts": {

0 commit comments

Comments
 (0)