starlingx
/
upstream
Code Issues Proposed changes

Fix package versions of openstack clients 

Our openstack clients are now based upon the master branch.
The rpm packaging version should reflect the latest tagged version,
as can be discovered by `git describe`.  The actual packaging
has fallen well behind that target.

This update will correct the rpm packaging.

Also the current packaging does not advance as new commits are
delivered to master.  I propose to use the TIS_BASE_SRCREV
mechanism to count commits passed the tag.

Now this is not ideal as it result in packages looking like this
 -- python-cinderclient-4.1.0-1.tis.33.src.rpm --
which may seem to imply that tis has authored 33 patches upon
python-cinderclient.  We are indeed 33 patches beyond tag
4.1.0 (as of this writing), but it is upstream revisions and
not stx (tis) revisions that are being counted.

We may want further build tool work to implement a second
revision counting mechanism to separate upstream revisions
from stx revisions.

Story: 2004751
Task: 28864
Change-Id: I90fa12084cef1faee52b38c328df078d2f18a001
Signed-off-by: Scott Little <scott.little@windriver.com>
This commit is contained in:
Scott Little 2019-03-08 15:55:36 -05:00
parent e1436e1acc
commit 40177cdbcf
26 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openstack/python-aodhclient/centos/build_srpm.data
View File

@ -1,3 +1,4 @@
TAR_NAME=aodhclient TAR_NAME=aodhclient
SRC_DIR=$CGCS_BASE/git/python-aodhclient SRC_DIR=$CGCS_BASE/git/python-aodhclient
TIS_PATCH_VER=0 TIS_BASE_SRCREV="1.2.0"
TIS_PATCH_VER=GITREVCOUNT

2
openstack/python-aodhclient/centos/python-aodhclient.spec
View File

@ -11,7 +11,7 @@ This is a client library for Aodh built on the Aodh API. It \
provides a Python API (the aodhclient module) and a command-line tool. provides a Python API (the aodhclient module) and a command-line tool.
Name: python-aodhclient Name: python-aodhclient
Version: 1.1.1 Version: 1.2.0
Release: 1%{?_tis_dist}.%{tis_patch_ver} Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: Python API and CLI for OpenStack Aodh Summary: Python API and CLI for OpenStack Aodh

3
openstack/python-barbicanclient/centos/build_srpm.data
View File

@ -1,3 +1,4 @@
TAR_NAME=python-barbicanclient TAR_NAME=python-barbicanclient
SRC_DIR=$CGCS_BASE/git/python-barbicanclient SRC_DIR=$CGCS_BASE/git/python-barbicanclient
TIS_PATCH_VER=0 TIS_BASE_SRCREV="4.8.1"
TIS_PATCH_VER=GITREVCOUNT

2
openstack/python-barbicanclient/centos/python-barbicanclient.spec
View File

@ -11,7 +11,7 @@ Python library for accessing the API (barbicanclient module), and \
a command-line script (barbican). a command-line script (barbican).
Name: python-barbicanclient Name: python-barbicanclient
Version: 4.7.1 Version: 4.8.1
Release: 1%{?_tis_dist}.%{tis_patch_ver} Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: Client Library for OpenStack Barbican Key Management API Summary: Client Library for OpenStack Barbican Key Management API

3
openstack/python-cinderclient/centos/build_srpm.data
View File

@ -1,3 +1,4 @@
TAR_NAME=python-cinderclient TAR_NAME=python-cinderclient
SRC_DIR=$CGCS_BASE/git/python-cinderclient SRC_DIR=$CGCS_BASE/git/python-cinderclient
TIS_PATCH_VER=0 TIS_BASE_SRCREV="4.1.0"
TIS_PATCH_VER=GITREVCOUNT

2
openstack/python-cinderclient/centos/python-cinderclient.spec
View File

@ -10,7 +10,7 @@ Client library (cinderclient python module) and command line utility \
(cinder) for interacting with OpenStack Cinder (Block Storage) API. (cinder) for interacting with OpenStack Cinder (Block Storage) API.
Name: python-cinderclient Name: python-cinderclient
Version: 4.0.1 Version: 4.1.0
Release: 1%{?_tis_dist}.%{tis_patch_ver} Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: Python API and CLI for OpenStack Cinder Summary: Python API and CLI for OpenStack Cinder

3
openstack/python-glanceclient/centos/build_srpm.data
View File

@ -1,3 +1,4 @@
TAR_NAME=python-glanceclient TAR_NAME=python-glanceclient
SRC_DIR="$CGCS_BASE/git/python-glanceclient" SRC_DIR="$CGCS_BASE/git/python-glanceclient"
TIS_PATCH_VER=0 TIS_BASE_SRCREV="2.16.0"
TIS_PATCH_VER=GITREVCOUNT

2
openstack/python-glanceclient/centos/python-glanceclient.spec
View File

@ -14,7 +14,7 @@ glanceclient module), and a command-line script (glance). Each implements \
Name: python-glanceclient Name: python-glanceclient
Epoch: 1 Epoch: 1
Version: 2.13.1 Version: 2.16.0
Release: 1%{?_tis_dist}.%{tis_patch_ver} Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: Python API and CLI for OpenStack Glance Summary: Python API and CLI for OpenStack Glance

3
openstack/python-gnocchiclient/centos/build_srpm.data
View File

@ -1,3 +1,4 @@
TAR_NAME=gnocchiclient TAR_NAME=gnocchiclient
SRC_DIR=$CGCS_BASE/git/python-gnocchiclient SRC_DIR=$CGCS_BASE/git/python-gnocchiclient
TIS_PATCH_VER=0 TIS_BASE_SRCREV="7.0.4"
TIS_PATCH_VER=GITREVCOUNT

3
openstack/python-heatclient/centos/build_srpm.data
View File

@ -1,4 +1,5 @@
TAR_NAME=python-heatclient TAR_NAME=python-heatclient
SRC_DIR=$CGCS_BASE/git/python-heatclient SRC_DIR=$CGCS_BASE/git/python-heatclient
TIS_PATCH_VER=0 TIS_BASE_SRCREV="1.17.0"
TIS_PATCH_VER=GITREVCOUNT

2
openstack/python-heatclient/centos/python-heatclient.spec
View File

@ -14,7 +14,7 @@ heatclient module), and a command-line script (heat). Each implements 100% of \
the OpenStack Heat API. the OpenStack Heat API.
Name: python-heatclient Name: python-heatclient
Version: 1.16.1 Version: 1.17.0
Release: 1%{?_tis_dist}.%{tis_patch_ver} Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: Python API and CLI for OpenStack Heat Summary: Python API and CLI for OpenStack Heat

3
openstack/python-ironicclient/centos/build_srpm.data
View File

@ -1,3 +1,4 @@
TAR_NAME="python-ironicclient" TAR_NAME="python-ironicclient"
SRC_DIR="$CGCS_BASE/git/python-ironicclient" SRC_DIR="$CGCS_BASE/git/python-ironicclient"
TIS_PATCH_VER=0 TIS_BASE_SRCREV="2.7.0"
TIS_PATCH_VER=GITREVCOUNT

2
openstack/python-ironicclient/centos/python-ironicclient.spec
View File

@ -9,7 +9,7 @@
%global common_desc A python and command line client library for Ironic %global common_desc A python and command line client library for Ironic
Name: python-ironicclient Name: python-ironicclient
Version: 2.5.0 Version: 2.7.0
Release: 1%{?_tis_dist}.%{tis_patch_ver} Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: Python client for Ironic Summary: Python client for Ironic

3
openstack/python-keystoneclient/centos/build_srpm.data
View File

@ -1,4 +1,5 @@
TAR_NAME=python-keystoneclient TAR_NAME=python-keystoneclient
SRC_DIR=$CGCS_BASE/git/python-keystoneclient SRC_DIR=$CGCS_BASE/git/python-keystoneclient
TIS_PATCH_VER=0 TIS_BASE_SRCREV="3.19.0"
TIS_PATCH_VER=GITREVCOUNT

2
openstack/python-keystoneclient/centos/python-keystoneclient.spec
View File

@ -10,7 +10,7 @@ Identity API.
Name: python-keystoneclient Name: python-keystoneclient
Epoch: 1 Epoch: 1
Version: 3.17.0 Version: 3.19.0
Release: 1%{?_tis_dist}.%{tis_patch_ver} Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: Client library for OpenStack Identity API Summary: Client library for OpenStack Identity API
License: ASL 2.0 License: ASL 2.0

3
openstack/python-magnumclient/centos/build_srpm.data
View File

@ -1,4 +1,5 @@
TAR_NAME="python-magnumclient" TAR_NAME="python-magnumclient"
SRC_DIR="$CGCS_BASE/git/python-magnumclient" SRC_DIR="$CGCS_BASE/git/python-magnumclient"
TIS_PATCH_VER=0 TIS_BASE_SRCREV="2.12.0"
TIS_PATCH_VER=GITREVCOUNT

2
openstack/python-magnumclient/centos/python-magnumclient.spec
View File

@ -17,7 +17,7 @@ command-line tool (magnum).
%global common_desc_tests Python-magnumclient test subpackage %global common_desc_tests Python-magnumclient test subpackage
Name: python-%{pname} Name: python-%{pname}
Version: 2.10.0 Version: 2.12.0
Release: 1%{?_tis_dist}.%{tis_patch_ver} Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: Client library for Magnum API Summary: Client library for Magnum API

3
openstack/python-neutronclient/centos/build_srpm.data
View File

@ -1,3 +1,4 @@
TAR_NAME=python-neutronclient TAR_NAME=python-neutronclient
SRC_DIR="$CGCS_BASE/git/python-neutronclient" SRC_DIR="$CGCS_BASE/git/python-neutronclient"
TIS_PATCH_VER=0 TIS_BASE_SRCREV="6.12.0"
TIS_PATCH_VER=GITREVCOUNT

2
openstack/python-neutronclient/centos/python-neutronclient.spec
View File

@ -11,7 +11,7 @@ Client library and command line utility for interacting with OpenStack \
Neutron's API. Neutron's API.
Name: python-neutronclient Name: python-neutronclient
Version: 6.9.1 Version: 6.12.0
Release: 1%{?_tis_dist}.%{tis_patch_ver} Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: Python API and CLI for OpenStack Neutron Summary: Python API and CLI for OpenStack Neutron

3
openstack/python-novaclient/centos/build_srpm.data
View File

@ -1,3 +1,4 @@
TAR_NAME=python-novaclient TAR_NAME=python-novaclient
SRC_DIR=$CGCS_BASE/git/python-novaclient SRC_DIR=$CGCS_BASE/git/python-novaclient
TIS_PATCH_VER=0 TIS_BASE_SRCREV="13.0.0"
TIS_PATCH_VER=GITREVCOUNT

2
openstack/python-novaclient/centos/python-novaclient.spec
View File

@ -14,7 +14,7 @@ the OpenStack Nova API.
Name: python-novaclient Name: python-novaclient
Epoch: 1 Epoch: 1
Version: 11.0.0 Version: 13.0.0
Release: 1%{?_tis_dist}.%{tis_patch_ver} Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: Python API and CLI for OpenStack Nova Summary: Python API and CLI for OpenStack Nova
License: ASL 2.0 License: ASL 2.0

3
openstack/python-openstackclient/centos/build_srpm.data
View File

@ -1,3 +1,4 @@
TAR_NAME=python-openstackclient TAR_NAME=python-openstackclient
SRC_DIR="$CGCS_BASE/git/python-openstackclient" SRC_DIR="$CGCS_BASE/git/python-openstackclient"
TIS_PATCH_VER=2 TIS_BASE_SRCREV="3.18.0"
TIS_PATCH_VER=GITREVCOUNT

2
openstack/python-openstackclient/centos/python-openstackclient.spec
View File

@ -16,7 +16,7 @@ It is a thin wrapper to the stock python-*client modules that implement the \
actual REST API client actions. actual REST API client actions.
Name: python-openstackclient Name: python-openstackclient
Version: 3.16.2 Version: 3.18.0
Release: 1%{?_tis_dist}.%{tis_patch_ver} Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: OpenStack Command-line Client Summary: OpenStack Command-line Client

3
openstack/python-openstacksdk/centos/build_srpm.data
View File

@ -1,3 +1,4 @@
TAR_NAME=openstacksdk TAR_NAME=openstacksdk
SRC_DIR="$CGCS_BASE/git/python-openstacksdk" SRC_DIR="$CGCS_BASE/git/python-openstacksdk"
TIS_PATCH_VER=0 TIS_BASE_SRCREV="0.25.0"
TIS_PATCH_VER=GITREVCOUNT

2
openstack/python-openstacksdk/centos/python-openstacksdk.spec
View File

@ -20,7 +20,7 @@ A collection of libraries for building applications to work with OpenStack \
clouds - test files clouds - test files
Name: python-%{pypi_name} Name: python-%{pypi_name}
Version: 0.17.2 Version: 0.25.0
Release: 1%{?_tis_dist}.%{tis_patch_ver} Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: An SDK for building applications to work with OpenStack Summary: An SDK for building applications to work with OpenStack

3
openstack/python-pankoclient/centos/build_srpm.data
View File

@ -1,3 +1,4 @@
TAR_NAME=pankoclient TAR_NAME=pankoclient
SRC_DIR=$CGCS_BASE/git/python-pankoclient SRC_DIR=$CGCS_BASE/git/python-pankoclient
TIS_PATCH_VER=0 TIS_BASE_SRCREV="0.5.0"
TIS_PATCH_VER=GITREVCOUNT