[PKG-Openstack-devel] Bug#880602: python-oslo.db: Align with Ubuntu

[Corey Bryant]

Package: python-oslo.db
Version: 4.25.0-3
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

    - d/control, d/tests/*: MySQL autopkgtests.
    - d/control: Retain Breaks/Replaces.
    - d/gbp.conf: Retain git-buildpackage config, including use of pristine-tar.
    - d/watch: Use tarballs.openstack.org.


Thanks for considering the patch.


-- System Information:
Debian Release: stretch/sid
  APT prefers bionic
  APT policy: (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-16-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
-------------- next part --------------
diff -Nru python-oslo.db-4.25.0/debian/control python-oslo.db-4.25.0/debian/control
--- python-oslo.db-4.25.0/debian/control	2017-11-01 18:23:20.000000000 -0400
+++ python-oslo.db-4.25.0/debian/control	2017-11-02 10:51:11.000000000 -0400
@@ -64,6 +64,7 @@
 Vcs-Browser: https://anonscm.debian.org/cgit/openstack/oslo/python-oslo.db.git
 Vcs-Git: https://anonscm.debian.org/git/openstack/oslo/python-oslo.db.git
 Homepage: https://launchpad.net/oslo
+XS-Testsuite: autopkgtest
 
 Package: python-oslo.db
 Architecture: all
@@ -80,6 +81,8 @@
  python-stevedore (>= 1.20.0),
  ${misc:Depends},
  ${python:Depends},
+Breaks: python-oslo-db (<< 1.10.0-1~),
+Replaces: python-oslo-db (<< 1.10.0-1~),
 Description: database connectivity to the different backends and helper utils - Python 2.x
  The Oslo database handling library is part of the OpenStack project. It
  provides database connectivity to the different backends and also provides
@@ -115,6 +118,8 @@
  python3-stevedore (>= 1.20.0),
  ${misc:Depends},
  ${python3:Depends},
+Breaks: python3-oslo-db (<< 1.10.0-1~),
+Replaces: python3-oslo-db (<< 1.10.0-1~),
 Description: database connectivity to the different backends and helper utils - Python 3.x
  The Oslo database handling library is part of the OpenStack project. It
  provides database connectivity to the different backends and also provides
diff -Nru python-oslo.db-4.25.0/debian/gbp.conf python-oslo.db-4.25.0/debian/gbp.conf
--- python-oslo.db-4.25.0/debian/gbp.conf	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.db-4.25.0/debian/gbp.conf	2017-11-02 10:51:11.000000000 -0400
@@ -0,0 +1,7 @@
+[DEFAULT]
+debian-branch = master
+upstream-tag = %(version)s
+pristine-tar = True
+
+[buildpackage]
+export-dir = ../build-area
diff -Nru python-oslo.db-4.25.0/debian/tests/control python-oslo.db-4.25.0/debian/tests/control
--- python-oslo.db-4.25.0/debian/tests/control	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.db-4.25.0/debian/tests/control	2017-11-02 10:51:11.000000000 -0400
@@ -0,0 +1,7 @@
+Tests: mysql
+Depends: alembic, python-babel, python-alembic, python-debtcollector, python-oslo.i18n, 
+ python-oslo.config, python-oslo.context, python-oslo.utils, python-sqlalchemy,
+ python-migrate, python-stevedore, python-six, python-fixtures, python-mock,
+ python-oslotest, python-os-testr, python-tox, python-oslo.db, mysql-server-5.7,
+ python-testresources, python-pymysql, python-mysql.connector
+Restrictions: allow-stderr needs-root breaks-testbed
diff -Nru python-oslo.db-4.25.0/debian/tests/mysql python-oslo.db-4.25.0/debian/tests/mysql
--- python-oslo.db-4.25.0/debian/tests/mysql	1969-12-31 19:00:00.000000000 -0500
+++ python-oslo.db-4.25.0/debian/tests/mysql	2017-11-02 10:51:11.000000000 -0400
@@ -0,0 +1,18 @@
+#!/bin/sh
+set -ex
+
+debconf-set-selections <<EOT
+mysql-server-5.7 mysql-server/root_password password rootpassword
+mysql-server-5.7 mysql-server/root_password_again password rootpassword
+EOT
+
+DEBIAN_FRONTEND=noninteractive dpkg-reconfigure mysql-server-5.7
+
+mysql --user=root --password=rootpassword <<EOT
+SET default_storage_engine=MYISAM;
+DROP DATABASE IF EXISTS openstack_citest;
+CREATE DATABASE openstack_citest CHARACTER SET utf8;
+EOT
+
+export OS_TEST_DBAPI_ADMIN_CONNECTION=mysql://root:rootpassword@localhost/
+ostestr init && ostestr run -p
diff -Nru python-oslo.db-4.25.0/debian/watch python-oslo.db-4.25.0/debian/watch
--- python-oslo.db-4.25.0/debian/watch	2017-11-01 18:23:20.000000000 -0400
+++ python-oslo.db-4.25.0/debian/watch	2017-11-02 10:51:11.000000000 -0400
@@ -1,3 +1,3 @@
 version=3
 opts="uversionmangle=s/\.(b|rc)/~$1/" \
-https://github.com/openstack/oslo.db/tags .*/(\d[\d\.]+)\.tar\.gz
+    http://tarballs.openstack.org/oslo.db/ oslo.db-(\d.*)\.tar\.gz