.gitignore

@@ -16,5 +16,3 @@
 /man-3.4.14.tar.gz
 /etcd-3.5.0.tar.gz
 /etcd-3.5.5.tar.gz
-/etcd-3.5.11.tar.gz
-/etcd-3.5.13.tar.gz

etcd.spec

@@ -9,7 +9,7 @@
 # https://github.com/etcd-io/etcd
 %global goipath         go.etcd.io/etcd
 %global forgeurl        https://github.com/etcd-io/etcd
-Version:                3.5.13
+Version:                3.5.5
 
 %gometa
 
@@ -47,6 +47,7 @@ Source2:        %{name}.conf
 
 BuildRequires:  python3-devel
 BuildRequires:  systemd-rpm-macros
+Requires(pre):  shadow-utils
 
 %description %{common_description}
 
@@ -82,11 +83,6 @@ shopt -u extglob
 %generate_buildrequires
 %go_generate_buildrequires
 
-# Create a sysusers.d config file
-cat >etcd.sysusers.conf <<EOF
-u etcd - 'etcd user' %{_sharedstatedir}/%{name} -
-EOF
-
 %build
 %gobuild -o %{gobuilddir}/bin/etcd %{goipath}/server/v3
 %gobuild -o %{gobuilddir}/bin/etcdctl %{goipath}/etcdctl/v3
@@ -107,8 +103,6 @@ install -pm 644 -t %{buildroot}%{_sysconfdir}/%{name} %{SOURCE2}
 # And create /var/lib/etcd
 install -dm 0755 %{buildroot}%{_sharedstatedir}/%{name}
 
-install -m0644 -D etcd.sysusers.conf %{buildroot}%{_sysusersdir}/etcd.conf
-
 %if %{with check}
 %check
 %gocheck -d client/v2 \
@@ -126,6 +120,10 @@ install -m0644 -D etcd.sysusers.conf %{buildroot}%{_sysusersdir}/etcd.conf
          -d pkg/v3/proxy
 %endif
 
+%pre
+getent group %{name} >/dev/null || groupadd -r %{name}
+getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/%{name} \
+    -s /sbin/nologin -c "etcd user" %{name}
 
 %post
 %systemd_post %{name}.service
@@ -147,7 +145,6 @@ install -m0644 -D etcd.sysusers.conf %{buildroot}%{_sysusersdir}/etcd.conf
 %endif
 
 %gopkgfiles
-%{_sysusersdir}/etcd.conf
 
 %changelog
 %autochangelog

sources

@@ -1 +1 @@
-SHA512 (etcd-3.5.13.tar.gz) = dc85d80079b61e96eb06eb573d41d8972060392e49140a2414c283ea9edfef7b01d5554e50c7ab37c6ad079b373ae12a1b84dbcc533addc1d4d30a2a5abf7b7b
+SHA512 (etcd-3.5.5.tar.gz) = 0e1d00a6c94b56cfb5e8f27172e749710938c0891eeaf3257e1dd22722e81d7402d44debb9784a1d330f900203e079956fcfe76e0e16f02a7d891e92f67976da

tests/tests.yml

@@ -1,3 +1,3 @@
 ---
 # Tests for classic environment
-- import_playbook: e2e_test_from_src_include.yml
+- include: e2e_test_from_src_include.yml