#1 Import from Software Factory and bump to 3.8.0
Closed a year ago by fbo. Opened a year ago by fbo.
rpms/ fbo/nodepool bump-3.8.0  into  master

file modified
+1 -1
@@ -1,3 +1,3 @@ 

  # nodepool

  

- The nodepool package 

\ No newline at end of file

+ The nodepool package

file modified
+4 -1
@@ -11,10 +11,13 @@ 

      level: INFO

      stream: ext://sys.stdout

    normal:

-     class: logging.handlers.WatchedFileHandler

+     class: logging.handlers.TimedRotatingFileHandler

      formatter: normal

      level: DEBUG

      filename: '/var/log/nodepool/builder.log'

+     when: 'midnight'

+     interval: 1

+     backupCount: 30

  loggers:

    nodepool:

      handlers:

file modified
+4 -1
@@ -11,10 +11,13 @@ 

      level: INFO

      stream: ext://sys.stdout

    normal:

-     class: logging.handlers.WatchedFileHandler

+     class: logging.handlers.TimedRotatingFileHandler

      formatter: normal

      level: DEBUG

      filename: '/var/log/nodepool/launcher.log'

+     when: 'midnight'

+     interval: 1

+     backupCount: 30

  loggers:

    nodepool:

      handlers:

file modified
+2 -2
@@ -51,9 +51,9 @@ 

  

  [handler_normal]

  level=DEBUG

- class=logging.handlers.WatchedFileHandler

+ class=logging.handlers.TimedRotatingFileHandler

  formatter=normal

- args=('/var/log/nodepool/nodepool.log',)

+ args=('/var/log/nodepool/nodepool.log', 'H', 8, 30,)

  

  

  [formatter_normal]

file modified
+5 -1
@@ -6,8 +6,12 @@ 

  Type=simple

  User=nodepool

  Group=nodepool

+ EnvironmentFile=-/etc/sysconfig/nodepool

  SyslogIdentifier=nodepool-builder

- ExecStart=/usr/bin/nodepool-builder -d -l /etc/nodepool/builder-logging.yaml

+ ExecStart=/usr/bin/nodepool-builder -d          \

+     -c /etc/nodepool/nodepool.yaml              \

+     -s /etc/nodepool/secure.conf                \

+     -l /etc/nodepool/builder-logging.yaml

  

  [Install]

  WantedBy=multi-user.target

file modified
+5 -1
@@ -7,7 +7,11 @@ 

  User=nodepool

  Group=nodepool

  SyslogIdentifier=nodepool-launcher

- ExecStart=/usr/bin/nodepool-launcher -d -l /etc/nodepool/launcher-logging.yaml

+ EnvironmentFile=-/etc/sysconfig/nodepool

+ ExecStart=/usr/bin/nodepool-launcher -d      \

+     -c /etc/nodepool/nodepool.yaml           \

+     -s /etc/nodepool/secure.conf             \

+     -l /etc/nodepool/launcher-logging.yaml

  

  [Install]

  WantedBy=multi-user.target

file removed
-7
@@ -1,7 +0,0 @@ 

- /var/log/nodepool/*.log {

-     missingok

-     notifempty

-     compress

-     delaycompress

-     copytruncate

- }

file modified
+69 -128
@@ -1,165 +1,119 @@ 

+ %global srcname nodepool

+ 

+ %global nfsmountable 1

+ 

  Name:           nodepool

- Version:        3.0.0

- Release:        7%{?dist}

- Summary:        Node pool management for a distributed test infrastructure

+ Version:        3.8.0

+ Release:        1%{?dist}

+ Summary:        Nodepool management for a distributed test infrastructure

  

  License:        ASL 2.0

  URL:            https://zuul-ci.org

- Source0:        http://tarballs.openstack.org/nodepool/nodepool-%{version}.tar.gz

+ # 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

  Source1:        nodepool-launcher.service

  Source2:        nodepool-builder.service

- Source3:        nodepool.yaml

- Source4:        logging.conf

- Source5:        launcher-logging.yaml

- Source6:        builder-logging.yaml

- Source7:        nodepool.logrotate

+ Source10:       nodepool.yaml

+ Source11:       secure.conf

+ Source12:       logging.conf

+ Source13:       launcher-logging.yaml

+ Source14:       builder-logging.yaml

+ Source15:       sudoer

  

  BuildArch:      noarch

  

- Requires:       python3

+ Requires:       ansible

  Requires:       python3-pbr

- Requires:       python3-PyYAML

+ Requires:       python3-pyyaml

+ Requires:       python3-paramiko

  Requires:       python3-daemon

  Requires:       python3-extras

  Requires:       python3-statsd

- Requires:       python3-sqlalchemy

  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

  

  BuildRequires:  python3-devel

  BuildRequires:  python3-pbr

  BuildRequires:  python3-setuptools

- 

- # Doc building requirements

- BuildRequires:  python3-sphinxcontrib-programoutput

- BuildRequires:  python3-sphinxcontrib-httpdomain

- BuildRequires:  python3-kazoo

- BuildRequires:  python3-daemon

- BuildRequires:  python3-extras

- BuildRequires:  python3-PyYAML

- BuildRequires:  python3-statsd

- BuildRequires:  python3-paste

- BuildRequires:  python3-webob

- BuildRequires:  python3-prettytable

- BuildRequires:  python3-voluptuous

- BuildRequires:  help2man

- 

- %{?systemd_requires}

  BuildRequires:  systemd

  

+ 

  %description

  Nodepool is a service used by the OpenStack CI team to deploy and manage a pool

  of devstack images on a cloud server for use in OpenStack project testing.

  

  

- %package driver-openstack

- Summary:        Nodepool OpenStack driver

- Requires:       nodepool-launcher

- Requires:       python3-os-client-config

- Requires:       python3-shade

- Requires:       python3-paramiko

- 

- %description driver-openstack

- Nodepool OpenStack driver

- 

- 

- %package driver-static

- Summary:        Nodepool OpenStack driver

- Requires:       nodepool-launcher

- 

- %description driver-static

- Nodepool Static driver

- 

- 

  %package launcher

  Summary:        Nodepool launcher service

  Requires:       nodepool

  

  %description launcher

- Nodepool launcher service

+ Nodepool launcher service.

  

  

  %package builder

  Summary:        Nodepool builder service

  Requires:       nodepool

- Requires:       dnf-utils

+ Requires:       yum-utils

  Requires:       sudo

  Requires:       qemu-img

  

  %description builder

- Nodepool builder service

+ Nodepool builder service.

  

  

  %package doc

- Summary: The Nodepool documentation

- 

+ Summary:        Nodepool documentation

+ BuildRequires:  python3-zuul-sphinx

+ BuildRequires:  python3-sphinx

+ BuildRequires:  python3-voluptuous

+ BuildRequires:  python3-kazoo

+ BuildRequires:  python3-zuul-sphinx

+ BuildRequires:  python3-snowballstemmer

+ BuildRequires:  python3-sphinxcontrib-programoutput

+ BuildRequires:  python3-sphinxcontrib-httpdomain

+ BuildRequires:  python3-reno

+ #

  %description doc

- The Nodepool documentation

+ Nodepool documentation.

  

  

  %prep

- %autosetup -n nodepool-%{version}

- rm -Rf *requirements.txt *.egg-info

- 

- # Remove test files

- rm -Rf nodepool/tests nodepool/driver/fake

- 

- # Remove interpreter

- find nodepool/ -type f -exec sed -i -e '/#!\/usr\/bin\/.*python.*/{1D}' {} \;

+ %autosetup -n nodepool -p1

+ rm requirements.txt test-requirements.txt

+ rm -Rf nodepool/tests

  

  

  %build

- PBR_VERSION=%{version} %py3_build

- PBR_VERSION=%{version} SPHINX_DEBUG=1 sphinx-build -b html doc/source build/html

- 

- rm -Rf build/html/.buildinfo

- 

- # Generate man pages

- mkdir man

- pushd man

- echo -e "#!/usr/bin/python3\nimport sys\nfrom nodepool.cmd.nodepoolcmd import main\nmain()" > nodepool

- echo -e "#!/usr/bin/python3\nimport sys\nfrom nodepool.cmd.launcher import main\nmain()" > nodepool-launcher

- echo -e "#!/usr/bin/python3\nimport sys\nfrom nodepool.cmd.builder import main\nmain()" > nodepool-builder

- chmod +x nodepool*

- # Test the command first to output missing BuildRequirements

- PYTHONPATH=../ ./nodepool-builder --help

- PYTHONPATH=../ ./nodepool-launcher --help

- PYTHONPATH=../ ./nodepool --help

- PYTHONPATH=../ help2man --no-info -o nodepool-builder.man ./nodepool-builder

- PYTHONPATH=../ help2man --no-info -o nodepool-launcher.man ./nodepool-launcher

- PYTHONPATH=../ help2man --no-info -o nodepool.man ./nodepool

- popd

+ PBR_VERSION=%{version} %{__python3} setup.py build

+ PBR_VERSION=%{version} SPHINX_DEBUG=1 sphinx-build-3 -b html doc/source build/html

  

  

  %install

- PBR_VERSION=%{version} %py3_install

- 

- # Remove executable bit from libraries

- find %{buildroot}%{python3_sitelib}/nodepool -type f -exec chmod -x {} \;

- 

- # Man pages

- install -p -D -m 0644 man/nodepool-builder.man %{buildroot}%{_mandir}/man1/nodepool-builder.1

- install -p -D -m 0644 man/nodepool-launcher.man %{buildroot}%{_mandir}/man1/nodepool-launcher.1

- install -p -D -m 0644 man/nodepool.man %{buildroot}%{_mandir}/man1/nodepool.1

+ PBR_VERSION=%{version} %{__python3} setup.py install --skip-build --root %{buildroot}

  

- # Service unit

+ # Copy non python modules over

  install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/nodepool-launcher.service

  install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/nodepool-builder.service

- 

- # Basic configuration

- install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/nodepool/nodepool.yaml

+ install -p -D -m 0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/nodepool/nodepool.yaml

+ install -p -D -m 0640 %{SOURCE11} %{buildroot}%{_sysconfdir}/nodepool/secure.conf

+ install -p -D -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/nodepool/logging.conf

+ install -p -D -m 0644 %{SOURCE13} %{buildroot}%{_sysconfdir}/nodepool/launcher-logging.yaml

+ install -p -D -m 0644 %{SOURCE14} %{buildroot}%{_sysconfdir}/nodepool/builder-logging.yaml

+ install -p -D -m 0640 %{SOURCE15} %{buildroot}%{_sysconfdir}/sudoers.d/nodepool

+ install -p -d -m 0755 %{buildroot}%{_sysconfdir}/nodepool/scripts

  install -p -d -m 0755 %{buildroot}%{_sysconfdir}/nodepool/elements

- touch %{buildroot}%{_sysconfdir}/nodepool/secure.conf

- install -p -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nodepool/logging.conf

- install -p -D -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/nodepool/launcher-logging.yaml

- install -p -D -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/nodepool/builder-logging.yaml

- install -p -D -m 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/nodepool

- 

- # Service base directories

  install -p -d -m 0700 %{buildroot}%{_sharedstatedir}/nodepool

  install -p -d -m 0700 %{buildroot}%{_sharedstatedir}/nodepool/dib

  install -p -d -m 0700 %{buildroot}%{_sharedstatedir}/nodepool/.config/openstack
@@ -193,50 +147,37 @@ 

  

  

  %files

- %license LICENSE

- %{_mandir}/man1/nodepool.1*

  %{_bindir}/nodepool

- %exclude %{python3_sitelib}/nodepool/driver/openstack

- %{python3_sitelib}/nodepool

- %{python3_sitelib}/nodepool-*.egg-info

- %dir %{_sysconfdir}/nodepool/elements

- %dir %{_sysconfdir}/nodepool/

- %config(noreplace) %{_sysconfdir}/nodepool/nodepool.yaml

- %config(noreplace) %{_sysconfdir}/nodepool/logging.conf

- %config(noreplace) %{_sysconfdir}/logrotate.d/nodepool

+ %config(noreplace) %attr(0644, root, root) %{_sysconfdir}/nodepool/logging.conf

+ %config(noreplace) %attr(0644, root, root) %{_sysconfdir}/nodepool/nodepool.yaml

  %config(noreplace) %attr(0640, root, nodepool) %{_sysconfdir}/nodepool/secure.conf

- %attr(0750, nodepool, nodepool) %{_sharedstatedir}/nodepool

+ %dir %{_sysconfdir}/nodepool/scripts

+ %dir %{_sysconfdir}/nodepool/elements

  %dir %attr(0750, nodepool, nodepool) %{_localstatedir}/log/nodepool

- 

- %files driver-openstack

- %license LICENSE

- %{python3_sitelib}/nodepool/driver/openstack

- 

- %files driver-static

- %license LICENSE

- %{python3_sitelib}/nodepool/driver/static

+ %attr(0750, nodepool, nodepool) %{_sharedstatedir}/nodepool

+ %{python3_sitelib}/nodepool

+ %{python3_sitelib}/nodepool-*.egg-info

  

  %files launcher

- %license LICENSE

- %{_mandir}/man1/nodepool-launcher.1*

  %{_bindir}/nodepool-launcher

- %config(noreplace) %attr(0644, root, root) %{_sysconfdir}/nodepool/launcher-logging.yaml

  %{_unitdir}/nodepool-launcher.service

+ %config(noreplace) %attr(0644, root, root) %{_sysconfdir}/nodepool/launcher-logging.yaml

  

  %files builder

- %license LICENSE

- %{_mandir}/man1/nodepool-builder.1*

  %{_bindir}/nodepool-builder

- %config(noreplace) %{_sysconfdir}/nodepool/builder-logging.yaml

  %{_unitdir}/nodepool-builder.service

+ %{_sysconfdir}/sudoers.d/nodepool

+ %config(noreplace) %attr(0644, root, root) %{_sysconfdir}/nodepool/builder-logging.yaml

  %attr(0755, nodepool, nodepool) %{_localstatedir}/cache/nodepool

  

  %files doc

- %license LICENSE

- %doc build/html

+ %doc LICENSE build/html

  

  

  %changelog

+ * Fri Oct 11 2019 Fabien Boucher <fboucher@redhat.com> - 3.8.0-1

+ - Import 3.8.0 packaging from Software Factory

+ 

  * Thu Oct 03 2019 Miro HronĨok <mhroncok@redhat.com> - 3.0.0-7

  - Rebuilt for Python 3.8.0rc1 (#1748018)

  

file modified
+11 -5
@@ -1,17 +1,23 @@ 

  elements-dir: /etc/nodepool/elements

  images-dir: /var/lib/nodepool/dib

  

- webapp:

-   port: 8005

-   listen_address: '0.0.0.0'

+ cron:

+   cleanup: '*/30 * * * *'

+   check: '*/15 * * * *'

+ 

+ zmq-publishers: []

+ 

+ gearman-servers:

+   - host: localhost

  

  zookeeper-servers:

    - host: localhost

-     port: 2181

-     chroot: /nodepool

+     chroot: nodepool

  

  labels: []

  

  providers: []

  

+ targets: []

+ 

  diskimages: []

file added
empty or binary file added
file added
+3
@@ -0,0 +1,3 @@ 

+ Defaults    !requiretty

+ 

+ nodepool ALL = NOPASSWD:ALL

Bump to 3.8.0. Imported from SF packaging

Depends-On: https://pagure.io/zuul-distro-jobs/pull-request/23

rebased onto 8faea4a

a year ago

@tdecacqu would you mind adding openstack-sig as an admin for rpms/nodepool ?

Build failed.

Build failed.

Build failed.

Build failed.

Build failed.

Build failed.

Pull-Request has been closed by fbo

a year ago

Build failed.