| |
@@ -1,17 +1,12 @@
|
| |
- %global srcname nodepool
|
| |
-
|
| |
- %global nfsmountable 1
|
| |
-
|
| |
Name: nodepool
|
| |
- Version: 3.12.0
|
| |
- Release: 3%{?dist}
|
| |
+ Version: 3.13.1
|
| |
+ Release: 1%{?dist}
|
| |
Summary: Nodepool management for a distributed test infrastructure
|
| |
|
| |
License: ASL 2.0
|
| |
URL: https://zuul-ci.org
|
| |
- # Use gitea because tarball published by openstack doesn't have symlinks.
|
| |
- # It's also smaller as it doesn't contain built html bundles.
|
| |
- Source0: https://opendev.org/zuul/nodepool/archive/%{version}.tar.gz
|
| |
+ Source0: %pypi_source
|
| |
+
|
| |
Source1: nodepool-launcher.service
|
| |
Source2: nodepool-builder.service
|
| |
Source10: nodepool.yaml
|
| |
@@ -22,27 +17,6 @@
|
| |
|
| |
BuildArch: noarch
|
| |
|
| |
- Requires: ansible
|
| |
- Requires: python3-pbr
|
| |
- Requires: python3-pyyaml
|
| |
- Requires: python3-paramiko
|
| |
- Requires: python3-daemon
|
| |
- Requires: python3-extras
|
| |
- Requires: python3-statsd
|
| |
- Requires: python3-prettytable
|
| |
- Requires: python3-six
|
| |
- Requires: python3-os-client-config
|
| |
- Requires: python3-openstacksdk
|
| |
- Requires: diskimage-builder
|
| |
- Requires: python3-voluptuous
|
| |
- Requires: python3-kazoo
|
| |
- Requires: python3-paste
|
| |
- Requires: python3-webob
|
| |
- Requires: python3-kubernetes
|
| |
- Requires: python3-openshift
|
| |
- Requires: python3-boto3
|
| |
- Requires: python3-google-api-client
|
| |
-
|
| |
BuildRequires: python3-devel
|
| |
BuildRequires: python3-pbr
|
| |
BuildRequires: python3-setuptools
|
| |
@@ -56,7 +30,7 @@
|
| |
|
| |
%package launcher
|
| |
Summary: Nodepool launcher service
|
| |
- Requires: nodepool
|
| |
+ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
| |
|
| |
%description launcher
|
| |
Nodepool launcher service.
|
| |
@@ -64,10 +38,11 @@
|
| |
|
| |
%package builder
|
| |
Summary: Nodepool builder service
|
| |
- Requires: nodepool
|
| |
+ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
| |
Requires: yum-utils
|
| |
Requires: sudo
|
| |
Requires: qemu-img
|
| |
+ Requires: diskimage-builder
|
| |
|
| |
%description builder
|
| |
Nodepool builder service.
|
| |
@@ -84,33 +59,34 @@
|
| |
BuildRequires: python3-sphinxcontrib-programoutput
|
| |
BuildRequires: python3-sphinxcontrib-httpdomain
|
| |
BuildRequires: python3-reno
|
| |
- #
|
| |
+
|
| |
%description doc
|
| |
Nodepool documentation.
|
| |
|
| |
|
| |
%prep
|
| |
- %autosetup -n nodepool -p1
|
| |
- rm requirements.txt test-requirements.txt
|
| |
+ %autosetup -n nodepool-%{version} -p1
|
| |
+ sed -i "/^diskimage-builder>=2.36.0/d" requirements.txt
|
| |
+ sed -i "s/^openshift<=0.8.9/openshift/" requirements.txt
|
| |
rm -Rf nodepool/tests
|
| |
|
| |
|
| |
%build
|
| |
- PBR_VERSION=%{version} %{__python3} setup.py build
|
| |
+ %py3_build
|
| |
# Make the Nodepool directory a repo to satisfy python-reno
|
| |
- git init /builddir/build/BUILD/nodepool
|
| |
- pushd /builddir/build/BUILD/nodepool
|
| |
+ git init /builddir/build/BUILD/nodepool-%{version}
|
| |
+ pushd /builddir/build/BUILD/nodepool-%{version}
|
| |
git config user.email "you@example.com"
|
| |
git config user.name "Your Name"
|
| |
git add -A .
|
| |
git commit -m"Initial commit"
|
| |
popd
|
| |
PBR_VERSION=%{version} SPHINX_DEBUG=1 sphinx-build-3 -b html doc/source build/html
|
| |
- rm -Rf /builddir/build/BUILD/nodepool/.git
|
| |
+ rm -Rf /builddir/build/BUILD/nodepool-%{version}/.git
|
| |
|
| |
|
| |
%install
|
| |
- PBR_VERSION=%{version} %{__python3} setup.py install --skip-build --root %{buildroot}
|
| |
+ %py3_install
|
| |
|
| |
# Copy non python modules over
|
| |
install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/nodepool-launcher.service
|
| |
@@ -182,6 +158,9 @@
|
| |
|
| |
|
| |
%changelog
|
| |
+ * Tue Feb 16 2021 Fabien Boucher <fboucher@redhat.com> - 3.13.1-1
|
| |
+ - Bump to 3.13.1
|
| |
+
|
| |
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-3
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
| |
|
| |
