Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-glean for openSUSE:Factory
checked in at 2021-02-07 15:21:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-glean (Old)
and /work/SRC/openSUSE:Factory/.python-glean.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-glean"
Sun Feb 7 15:21:37 2021 rev:8 rq:869792 version:1.18.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-glean/python-glean.changes
2020-06-05 20:25:48.372867617 +0200
+++ /work/SRC/openSUSE:Factory/.python-glean.new.28504/python-glean.changes
2021-02-07 15:24:14.666214620 +0100
@@ -1,0 +2,12 @@
+Thu Feb 4 18:39:08 UTC 2021 - Ben Greiner <c...@bnavigator.de>
+
+- Update to 1.18.2
+ * add hosts entries and ssh keys only once
+ * Do not fail if routes are missing from a network
+- Changes in 1.18.1
+ * Add container build jobs
+ * Drop release test
+ * Update functional tests
+- Only test on python3: OpenStack oslotest only available there
+
+-------------------------------------------------------------------
Old:
----
glean-1.18.0.tar.gz
New:
----
glean-1.18.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-glean.spec ++++++
--- /var/tmp/diff_new_pack.fltNY4/_old 2021-02-07 15:24:15.214215246 +0100
+++ /var/tmp/diff_new_pack.fltNY4/_new 2021-02-07 15:24:15.218215250 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-glean
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-glean
-Version: 1.18.0
+Version: 1.18.2
Release: 0
Summary: Program to write static config from config-drive
License: Apache-2.0
@@ -33,13 +33,13 @@
Requires(postun): update-alternatives
BuildArch: noarch
# SECTION test requirements
-BuildRequires: %{python_module Sphinx >= 1.1.2}
-BuildRequires: %{python_module mock >= 1.0}
-BuildRequires: %{python_module oslotest >= 1.1.0.0a1}
-BuildRequires: %{python_module python-subunit}
-BuildRequires: %{python_module testrepository >= 0.0.18}
-BuildRequires: %{python_module testscenarios >= 0.4}
-BuildRequires: %{python_module testtools >= 0.9.34}
+# The OpenStack package oslotest is only available for the primary python3
flavor on TW.
+# On Leap (backports at least), the python2 package conflicts with the python3
package.
+BuildRequires: python3-oslotest >= 1.1.0.0a1
+BuildRequires: python3-python-subunit
+BuildRequires: python3-testrepository >= 0.0.18
+BuildRequires: python3-testscenarios >= 0.4
+BuildRequires: python3-testtools >= 0.9.34
# /SECTION
%python_subpackages
@@ -64,10 +64,9 @@
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
-%{python_expand rm -rf .testrepository
-export PYTHON=$python
-$python setup.py test
-}
+# only test the primary python3 flavor
+export PYTHON=%{_bindir}/python3
+python3 setup.py testr
%post
%python_install_alternative glean-install
++++++ glean-1.18.0.tar.gz -> glean-1.18.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/glean-1.18.0/.zuul.yaml new/glean-1.18.2/.zuul.yaml
--- old/glean-1.18.0/.zuul.yaml 2020-04-21 22:17:14.000000000 +0200
+++ new/glean-1.18.2/.zuul.yaml 2021-01-08 18:34:05.000000000 +0100
@@ -4,22 +4,28 @@
- openstack-python35-jobs-no-constraints
check:
jobs:
+ - opendev-buildset-registry
+ - nodepool-build-image-siblings
- dib-nodepool-functional-openstack-gentoo-src:
voting: false
- dib-nodepool-functional-openstack-centos-7-src
- - dib-nodepool-functional-openstack-fedora-30-src
+ - dib-nodepool-functional-openstack-centos-8-src
+ - dib-nodepool-functional-openstack-fedora-32-src
- dib-nodepool-functional-openstack-ubuntu-xenial-src
- - dib-nodepool-functional-openstack-ubuntu-bionic
- dib-nodepool-functional-openstack-ubuntu-bionic-src
gate:
jobs:
+ - opendev-buildset-registry
+ - nodepool-build-image-siblings
- dib-nodepool-functional-openstack-centos-7-src
- - dib-nodepool-functional-openstack-fedora-30-src
+ - dib-nodepool-functional-openstack-centos-8-src
+ - dib-nodepool-functional-openstack-fedora-32-src
- dib-nodepool-functional-openstack-ubuntu-xenial-src
- - dib-nodepool-functional-openstack-ubuntu-bionic
- dib-nodepool-functional-openstack-ubuntu-bionic-src
experimental:
jobs:
+ - opendev-buildset-registry
+ - nodepool-build-image-siblings
- dib-nodepool-functional-openstack-debian-stretch-src
- dib-nodepool-functional-openstack-debian-buster-src
- dib-nodepool-functional-openstack-opensuse-15-src
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/glean-1.18.0/AUTHORS new/glean-1.18.2/AUTHORS
--- old/glean-1.18.0/AUTHORS 2020-04-21 22:17:49.000000000 +0200
+++ new/glean-1.18.2/AUTHORS 2021-01-08 18:35:07.000000000 +0100
@@ -6,7 +6,9 @@
Clint Byrum <cl...@fewbar.com>
Colleen Murphy <colleen.mur...@suse.de>
CullenTaylor <mctay...@us.ibm.com>
+Daniel Pawlik <dpaw...@redhat.com>
Dirk Mueller <d...@dmllr.de>
+Dmitry Tantsur <dtant...@protonmail.com>
Gregory Haynes <g...@greghaynes.net>
Ian Wienand <iwien...@redhat.com>
Ilya Etingof <etin...@gmail.com>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/glean-1.18.0/ChangeLog new/glean-1.18.2/ChangeLog
--- old/glean-1.18.0/ChangeLog 2020-04-21 22:17:49.000000000 +0200
+++ new/glean-1.18.2/ChangeLog 2021-01-08 18:35:07.000000000 +0100
@@ -1,6 +1,21 @@
CHANGES
=======
+1.18.2
+------
+
+* add hosts entries and ssh keys only once
+* Replace Fedora 31 functional tests with Fedora 32
+* Do not fail if routes are missing from a network
+
+1.18.1
+------
+
+* switch glean.sh path in gentoo openrc init
+* Add container build jobs
+* Drop release test
+* Update functional tests
+
1.18.0
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/glean-1.18.0/PKG-INFO new/glean-1.18.2/PKG-INFO
--- old/glean-1.18.0/PKG-INFO 2020-04-21 22:17:49.000000000 +0200
+++ new/glean-1.18.2/PKG-INFO 2021-01-08 18:35:08.050836600 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: glean
-Version: 1.18.0
+Version: 1.18.2
Summary: Simple program to write static config from config-drive
Home-page: http://www.openstack.org/
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/glean-1.18.0/glean/cmd.py
new/glean-1.18.2/glean/cmd.py
--- old/glean-1.18.0/glean/cmd.py 2020-04-21 22:17:14.000000000 +0200
+++ new/glean-1.18.2/glean/cmd.py 2021-01-08 18:34:05.000000000 +0100
@@ -22,7 +22,6 @@
import json
import logging
import os
-import re
import subprocess
import sys
import time
@@ -202,7 +201,7 @@
# the return value, not append it
results = _set_rh_bonding(name, interface, distro, results)
routes = []
- for route in interface['routes']:
+ for route in interface.get('routes', ()):
if route['network'] == '0.0.0.0' and route['netmask'] == '0.0.0.0':
if not _is_suse(distro):
results += "DEFROUTE=yes\n"
@@ -657,7 +656,7 @@
hwaddr=interface['mac_address']
)
routes = list()
- for route in interface['routes']:
+ for route in interface.get('routes', ()):
if (route['network'] == '0.0.0.0' and
route['netmask'] == '0.0.0.0'):
# add default route if it exists
@@ -890,7 +889,7 @@
result += " netmask {0}\n".format(
utils.ipv6_netmask_length(interface['netmask']))
- for route in interface['routes']:
+ for route in interface.get('routes', ()):
if ((route['network'] == '0.0.0.0' and
route['netmask'] == '0.0.0.0') or
(route['network'] == '::' and
@@ -1419,7 +1418,7 @@
if key_title not in keys_to_write:
keys_to_write.append(key_title)
- if key not in keys_to_write:
+ if key.rstrip() not in keys_to_write:
keys_to_write.append(key)
files_to_write = {
@@ -1492,14 +1491,14 @@
for host in hosts_to_add:
host_value = hosts_to_add[host]
# See if we already have a hosts entry for hostname
- prog = re.compile('^%s .*%s\n' % (host_value, host))
- match = None
if os.path.isfile('/etc/hosts'):
- with open('/etc/hosts') as fh:
- match = prog.match(fh.read())
-
- # Write out a hosts entry for hostname
- if match is None:
+ with safe_open('/etc/hosts', 'r+') as fh:
+ for line in fh:
+ if line.startswith('%s %s' % (host_value, host)):
+ break
+ else:
+ fh.write(u'%s %s\n' % (host_value, host))
+ else:
with safe_open('/etc/hosts', 'a+') as fh:
fh.write(u'%s %s\n' % (host_value, host))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/glean-1.18.0/glean/init/glean.openrc
new/glean-1.18.2/glean/init/glean.openrc
--- old/glean-1.18.0/glean/init/glean.openrc 2020-04-21 22:17:14.000000000
+0200
+++ new/glean-1.18.2/glean/init/glean.openrc 2021-01-08 18:34:05.000000000
+0100
@@ -5,7 +5,7 @@
description="basic instance setup"
start() {
- /usr/bin/glean.sh
+ %%GLEANSH_PATH%%/glean.sh
eend 0
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/glean-1.18.0/glean/install.py
new/glean-1.18.2/glean/install.py
--- old/glean-1.18.0/glean/install.py 2020-04-21 22:17:14.000000000 +0200
+++ new/glean-1.18.2/glean/install.py 2021-01-08 18:34:05.000000000 +0100
@@ -87,6 +87,7 @@
action="store_true")
args = parser.parse_args()
+ p = _find_gleansh_path()
if args.quiet:
logging.basicConfig(level=logging.ERROR)
@@ -96,7 +97,8 @@
# needs to go first because gentoo can have systemd along side openrc
if os.path.exists('/etc/gentoo-release'):
log.info('installing openrc services')
- install('glean.openrc', '/etc/init.d/glean')
+ install('glean.openrc', '/etc/init.d/glean',
+ replacements={'GLEANSH_PATH': p})
# Needs to check for the presence of systemd and systemctl
# as apparently some packages may stage systemd init files
# when systemd is not present.
@@ -107,7 +109,6 @@
if (os.path.exists('/usr/lib/systemd/system') and
(os.path.exists('/usr/bin/systemctl') or
os.path.exists('/bin/systemctl'))):
- p = _find_gleansh_path()
log.info("Installing systemd services")
log.info("glean.sh in %s" % p)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/glean-1.18.0/glean/tests/test_glean.py
new/glean-1.18.2/glean/tests/test_glean.py
--- old/glean-1.18.0/glean/tests/test_glean.py 2020-04-21 22:17:14.000000000
+0200
+++ new/glean-1.18.2/glean/tests/test_glean.py 2021-01-08 18:34:05.000000000
+0100
@@ -92,7 +92,7 @@
# note; don't use spec=file here ... it's not py3
# compatible. It really just limits the allowed
# mocked functions.
- mock_handle = mock.Mock()
+ mock_handle = mock.MagicMock()
mock_handle.__enter__ = mock.Mock()
mock_handle.__exit__ = mock.Mock()
mock_handle.name = path
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/glean-1.18.0/glean.egg-info/PKG-INFO
new/glean-1.18.2/glean.egg-info/PKG-INFO
--- old/glean-1.18.0/glean.egg-info/PKG-INFO 2020-04-21 22:17:49.000000000
+0200
+++ new/glean-1.18.2/glean.egg-info/PKG-INFO 2021-01-08 18:35:07.000000000
+0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: glean
-Version: 1.18.0
+Version: 1.18.2
Summary: Simple program to write static config from config-drive
Home-page: http://www.openstack.org/
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/glean-1.18.0/glean.egg-info/pbr.json
new/glean-1.18.2/glean.egg-info/pbr.json
--- old/glean-1.18.0/glean.egg-info/pbr.json 2020-04-21 22:17:49.000000000
+0200
+++ new/glean-1.18.2/glean.egg-info/pbr.json 2021-01-08 18:35:07.000000000
+0100
@@ -1 +1 @@
-{"git_version": "d0f8a75", "is_release": true}
\ No newline at end of file
+{"git_version": "8dc38e4", "is_release": true}
\ No newline at end of file
