Hello community, here is the log from the commit of package python-monascaclient for openSUSE:Factory checked in at 2019-12-04 13:48:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-monascaclient (Old) and /work/SRC/openSUSE:Factory/.python-monascaclient.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-monascaclient" Wed Dec 4 13:48:42 2019 rev:10 rq:736661 version:1.16.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-monascaclient/python-monascaclient.changes 2019-07-04 15:42:23.218027831 +0200 +++ /work/SRC/openSUSE:Factory/.python-monascaclient.new.4691/python-monascaclient.changes 2019-12-04 14:18:55.522364558 +0100 @@ -1,0 +2,16 @@ +Wed Oct 9 13:03:20 UTC 2019 - cloud-de...@suse.de + +- update to version 1.16.0 + - Fix metric list formatting with Python 3 + - Push Docker image to Docker Hub + - Create Docker image and build in Zuul + - OpenDev Migration Patch + - Dropping the py35 testing + - Update master for stable/stein + - Replace git.openstack.org URLs with opendev.org URLs + - Replace openstack.org git:// URLs with https:// + - Change repository links usage in Dockerfile and build image + - Switch python3 versions of test jobs to match Train PTI + - Add Python 3 Train unit tests + +------------------------------------------------------------------- Old: ---- python-monascaclient-1.15.0.tar.gz New: ---- python-monascaclient-1.16.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-monascaclient.spec ++++++ --- /var/tmp/diff_new_pack.bS9H45/_old 2019-12-04 14:18:55.962364929 +0100 +++ /var/tmp/diff_new_pack.bS9H45/_new 2019-12-04 14:18:55.974364939 +0100 @@ -17,31 +17,26 @@ Name: python-monascaclient -Version: 1.15.0 +Version: 1.16.0 Release: 0 Summary: Python API and CLI for OpenStack Monasca License: Apache-2.0 Group: Development/Languages/Python URL: https://launchpad.net/python-monascaclient -Source0: https://files.pythonhosted.org/packages/source/p/python-monascaclient/python-monascaclient-1.15.0.tar.gz +Source0: https://files.pythonhosted.org/packages/source/p/python-monascaclient/python-monascaclient-1.16.0.tar.gz BuildRequires: openstack-macros BuildRequires: python2-PrettyTable >= 0.7.2 BuildRequires: python2-PyYAML >= 3.12 BuildRequires: python2-fixtures -BuildRequires: python2-keystoneclient BuildRequires: python2-mock BuildRequires: python2-mox3 BuildRequires: python2-openstackdocstheme BuildRequires: python2-osc-lib >= 1.8.0 BuildRequires: python2-oslo.concurrency -BuildRequires: python2-oslo.config -BuildRequires: python2-oslo.i18n -BuildRequires: python2-oslo.log BuildRequires: python2-oslo.serialization >= 2.18.0 BuildRequires: python2-oslo.utils >= 3.33.0 BuildRequires: python2-oslotest BuildRequires: python2-pbr >= 2.0.0 -BuildRequires: python2-requests-mock BuildRequires: python2-setuptools BuildRequires: python2-stestr BuildRequires: python2-testscenarios @@ -49,20 +44,15 @@ BuildRequires: python3-PrettyTable >= 0.7.2 BuildRequires: python3-PyYAML >= 3.12 BuildRequires: python3-fixtures -BuildRequires: python3-keystoneclient BuildRequires: python3-mock BuildRequires: python3-mox3 BuildRequires: python3-openstackdocstheme BuildRequires: python3-osc-lib >= 1.8.0 BuildRequires: python3-oslo.concurrency -BuildRequires: python3-oslo.config -BuildRequires: python3-oslo.i18n -BuildRequires: python3-oslo.log BuildRequires: python3-oslo.serialization >= 2.18.0 BuildRequires: python3-oslo.utils >= 3.33.0 BuildRequires: python3-oslotest BuildRequires: python3-pbr >= 2.0.0 -BuildRequires: python3-requests-mock BuildRequires: python3-setuptools BuildRequires: python3-stestr BuildRequires: python3-testscenarios @@ -70,12 +60,8 @@ Requires: python-Babel >= 2.3.4 Requires: python-PrettyTable >= 0.7.2 Requires: python-PyYAML >= 3.12 -Requires: python-keystoneclient +Requires: python-iso8601 >= 0.1.11 Requires: python-osc-lib >= 1.8.0 -Requires: python-oslo.concurrency -Requires: python-oslo.config -Requires: python-oslo.i18n -Requires: python-oslo.log Requires: python-oslo.serialization >= 2.18.0 Requires: python-oslo.utils >= 3.33.0 Requires: python-pbr >= 2.0.0 @@ -100,7 +86,7 @@ The Monasca Client was written using the OpenStack Heat Python client as a framework. %prep -%autosetup -p1 -n python-monascaclient-1.15.0 +%autosetup -p1 -n python-monascaclient-1.16.0 %py_req_cleanup %build ++++++ _service ++++++ --- /var/tmp/diff_new_pack.bS9H45/_old 2019-12-04 14:18:56.018364976 +0100 +++ /var/tmp/diff_new_pack.bS9H45/_new 2019-12-04 14:18:56.018364976 +0100 @@ -1,8 +1,8 @@ <services> <service mode="disabled" name="renderspec"> - <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/stein/openstack/python-monascaclient/python-monascaclient.spec.j2</param> + <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/train/openstack/python-monascaclient/python-monascaclient.spec.j2</param> <param name="output-name">python-monascaclient.spec</param> - <param name="requirements">https://raw.githubusercontent.com/openstack/python-monascaclient/stable/stein/requirements.txt</param> + <param name="requirements">https://raw.githubusercontent.com/openstack/python-monascaclient/stable/train/requirements.txt</param> <param name="changelog-email">cloud-de...@suse.de</param> <param name="changelog-provider">gh,openstack,python-monascaclient</param> </service> ++++++ python-monascaclient-1.15.0.tar.gz -> python-monascaclient-1.16.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-monascaclient-1.15.0/.zuul.yaml new/python-monascaclient-1.16.0/.zuul.yaml --- old/python-monascaclient-1.15.0/.zuul.yaml 2019-05-09 16:06:09.000000000 +0200 +++ new/python-monascaclient-1.16.0/.zuul.yaml 2019-09-13 18:07:46.000000000 +0200 @@ -3,9 +3,56 @@ - openstack-cover-jobs - openstack-lower-constraints-jobs - openstack-python-jobs - - openstack-python35-jobs - - openstack-python36-jobs - - openstack-python37-jobs + - openstack-python3-train-jobs - publish-openstack-docs-pti - check-requirements - release-notes-jobs-python3 + check: + jobs: + - docker-build-monasca-service + post: + jobs: + - publish-monasca-client-docker-image + periodic: + jobs: + - publish-monasca-client-docker-image + release: + jobs: + - publish-monasca-client-docker-image + +- job: + name: publish-monasca-client-docker-image + parent: build-monasca-docker-image + post-run: playbooks/docker-publish.yml + required-projects: + - openstack/monasca-common + vars: + publisher: true + secrets: + - doker_hub_login_client + +- secret: + name: doker_hub_login_client + data: + user: !encrypted/pkcs1-oaep + - QdHgQ9lGfeOypCKTX9funuwbHCVRhUGfyswosl9whSskzy1EhztLSPpP5PPHg/ZM0Ag8o + VAHT6La7oroTDeWYcDJmN8Zc5mslQlcskwoq9TN/VWEhY36+OF3k938Zr78URwOT5Hqm4 + ch+itjmydrQOrqcCwJ3ROrrJ2XpIMainz567U1HYuUari9B3zOUTW3xJfqbJ8UJIn/Irj + qEHn4Rn/RT3fOBcLwZfWJOcuwes8dsQykXNufLxXy2UGpdcHlE6lAAnRBgN/EPBxtqpAB + j+TO3s3yJLCIXDPIV+nST8z6EbvYc+woM4O1PN0AQ/tfyulFGvDTJNIdKenUBD99rBBJS + RCBZ0hhVgqDE4y4fcHh6STde0UHUQgwdX9lbdC2MGZah0bjUWG67QMwdtiiBwktbz3nza + a7yjd6/6di3zstDDGRLvZ5+vJ0cE/4eeWUmXcq2c0dtggaFDXYhOIoM1xfHKNvMN6QjM1 + kETvG2aw/PyNYIJkNic19Qk7UbOrgKduZUA6K17xQ5lqIJn/JfRVQyvoi0pLMCsa1NSe+ + wlpg9acJ46l0licRJ8o+QA02cFcrl9gBY5x0WwO3N/+LOxc40L+hHJi2vzduQO0ikCYa4 + Lerew8vrpf2EZ3JV5JEuIQ0/q5V5ZXhCeJQ6JBdLusYF3LzHRkX+7DCt3UMgaU= + password: !encrypted/pkcs1-oaep + - uZOFnKJzCV26Ea3KtPmK0WaTCV6YqLgS0Y5BolGq4MahKftVXxDbWRtVMQWnwx8mMugmh + A8mtchoyvrIvH5gjU7SmvVYAyH5KJGdKnb/9jbYTJ/Zq9f2CFd10hlomIUIlbDixAIMmV + rbcexomEY5b15lF9F4I3ovwPEsqu0YcGMW7ABPdZaZx5JGDgYXXGWpy3CFvVV/MIzLbV+ + wgByN7RsBNEFY44/xLTBkjN4RHOWTo1hFLeblI2pRJ40fzPw6fuUpeG1oPV/l4h9cjTgq + KMr4RuxxvCI3D0nWmq8SrIJ446erEldolJtpKRLqn1GTcGgyQbUgiXA0Nd44sFAcmwTBz + vK4rgD9Akhz/bsV6P8P5x25YoU6oS8Vws4mKu+iw3TWn0e+467oFvw+PD4e3+JbSSofyh + 6gVRsXK+Ls7YMNdnoAe8XXh76IBfC639olAgFU7ewtcsOLAiVrqIIynWmprBJZ2apEBxs + jRNQpBgkTtUaaBcb3uGY3Fcip7PDcjcApYoaLHAUi2P2+o5gatsmySLb64g4O3rddn7Wf + 8uSWv123X4zvXIk3V7FmCeSXgamVuZKpRHbFIeq9S+13ze1HBce6s36egoiGTfCMq5wLr + XwRwytGr8JoI4c8YIQXffYxJhhbgA9Qn+FalsrJIQNR03GnA2oUKKNsZExwcPs= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-monascaclient-1.15.0/AUTHORS new/python-monascaclient-1.16.0/AUTHORS --- old/python-monascaclient-1.15.0/AUTHORS 2019-05-09 16:08:21.000000000 +0200 +++ new/python-monascaclient-1.16.0/AUTHORS 2019-09-13 18:08:49.000000000 +0200 @@ -4,6 +4,7 @@ Andreas Jaeger <a...@suse.com> Angelo Mendonca <angelomendo...@gmail.com> Anh Tran <an...@vn.fujitsu.com> +Arseni Lipinski <arseni.lipin...@ts.fujitsu.com> Artur Basiak <artur.bas...@ts.fujitsu.com> Cao Xuan Hoang <hoan...@vn.fujitsu.com> Charles Short <zul...@gmail.com> @@ -22,6 +23,7 @@ Doug Szumski <d...@stackhpc.com> Eyal <eyal.bar-i...@nokia.com> Flavio Percoco <flape...@gmail.com> +Ghanshyam Mann <gm...@ghanshyammann.com> Haiwei Xu <xu-hai...@mxw.nes.nec.co.jp> Ian Wienand <iwien...@redhat.com> Igor Ataide <igor...@lsd.ufcg.edu.br> @@ -82,5 +84,6 @@ qingszhao <zhao.daq...@99cloud.net> rajat29 <rajat.sha...@nectechnologies.in> ricolin <rico....@easystack.cn> +tushargite96 <tushar.g...@india.nec.com> venkatamahesh <venkatamaheshko...@gmail.com> xhzhf <guoyongxh...@163.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-monascaclient-1.15.0/ChangeLog new/python-monascaclient-1.16.0/ChangeLog --- old/python-monascaclient-1.15.0/ChangeLog 2019-05-09 16:08:21.000000000 +0200 +++ new/python-monascaclient-1.16.0/ChangeLog 2019-09-13 18:08:49.000000000 +0200 @@ -1,13 +1,20 @@ CHANGES ======= -1.15.0 +1.16.0 ------ +* Add Python 3 Train unit tests +* Switch python3 versions of test jobs to match Train PTI +* Change repository links usage in Dockerfile and build image +* Replace git.openstack.org URLs with opendev.org URLs +* Dropping the py35 testing +* OpenDev Migration Patch +* Push Docker image to Docker Hub +* Create Docker image and build in Zuul * Fix metric list formatting with Python 3 * Replace openstack.org git:// URLs with https:// -* Update UPPER\_CONSTRAINTS\_FILE for stable/stein -* Update .gitreview for stable/stein +* Update master for stable/stein 1.14.0 ------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-monascaclient-1.15.0/PKG-INFO new/python-monascaclient-1.16.0/PKG-INFO --- old/python-monascaclient-1.15.0/PKG-INFO 2019-05-09 16:08:21.000000000 +0200 +++ new/python-monascaclient-1.16.0/PKG-INFO 2019-09-13 18:08:49.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: python-monascaclient -Version: 1.15.0 +Version: 1.16.0 Summary: Monasca API Client Library Home-page: https://docs.openstack.org/python-monascaclient/latest/ Author: OpenStack @@ -35,7 +35,7 @@ .. _PyPi: https://pypi.python.org/pypi/python-monascaclient .. _Online Documentation: https://docs.openstack.org/python-monascaclient/latest/ .. _Bugs: https://storyboard.openstack.org/#!/project/880 - .. _Source: https://git.openstack.org/cgit/openstack/python-monascaclient + .. _Source: https://opendev.org/openstack/python-monascaclient Platform: UNKNOWN @@ -48,5 +48,5 @@ Classifier: Programming Language :: Python :: 2 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.5 Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-monascaclient-1.15.0/README.rst new/python-monascaclient-1.16.0/README.rst --- old/python-monascaclient-1.15.0/README.rst 2019-05-09 16:06:06.000000000 +0200 +++ new/python-monascaclient-1.16.0/README.rst 2019-09-13 18:07:46.000000000 +0200 @@ -27,4 +27,4 @@ .. _PyPi: https://pypi.python.org/pypi/python-monascaclient .. _Online Documentation: https://docs.openstack.org/python-monascaclient/latest/ .. _Bugs: https://storyboard.openstack.org/#!/project/880 -.. _Source: https://git.openstack.org/cgit/openstack/python-monascaclient +.. _Source: https://opendev.org/openstack/python-monascaclient diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-monascaclient-1.15.0/doc/source/installation.rst new/python-monascaclient-1.16.0/doc/source/installation.rst --- old/python-monascaclient-1.15.0/doc/source/installation.rst 2019-05-09 16:06:06.000000000 +0200 +++ new/python-monascaclient-1.16.0/doc/source/installation.rst 2019-09-13 18:07:46.000000000 +0200 @@ -14,7 +14,7 @@ Or, you can build it manually:: $ mkvirtualenv python-monascaclient - $ git clone https://git.openstack.org/openstack/python-monascaclient + $ git clone https://opendev.org/openstack/python-monascaclient $ cd python-monascaclient $ pip install -r ./requirements.txt $ python setup.py install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-monascaclient-1.15.0/docker/Dockerfile new/python-monascaclient-1.16.0/docker/Dockerfile --- old/python-monascaclient-1.15.0/docker/Dockerfile 1970-01-01 01:00:00.000000000 +0100 +++ new/python-monascaclient-1.16.0/docker/Dockerfile 2019-09-13 18:07:46.000000000 +0200 @@ -0,0 +1,24 @@ +ARG DOCKER_IMAGE=monasca/client +ARG APP_REPO=https://review.opendev.org/openstack/python-monascaclient + +# Branch, tag or git hash to build from. +ARG REPO_VERSION=master +ARG CONSTRAINTS_BRANCH=master + +# Always start from `monasca-base` image and use specific tag of it. +ARG BASE_TAG=master +FROM monasca/base:$BASE_TAG + +# Environment variables used for our service or wait scripts. +ENV \ + MONASCA_URI=monasca:8070 \ + OS_AUTH_URL=http://keystone:35357/v3 \ + OS_USERNAME=mini-mon \ + OS_PASSWORD=password \ + OS_TENANT_NAME=mini-mon \ + OS_DOMAIN_NAME=Default + +RUN monasca --version + +# Implement start script in `start.sh` file. +CMD ["/start.sh"] \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-monascaclient-1.15.0/docker/README.rst new/python-monascaclient-1.16.0/docker/README.rst --- old/python-monascaclient-1.15.0/docker/README.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/python-monascaclient-1.16.0/docker/README.rst 2019-09-13 18:07:46.000000000 +0200 @@ -0,0 +1,65 @@ +=============================== +Docker image for Monasca Client +=============================== +The Monasca Client image is based on the monasca-base image. + + +Building monasca-base image +=========================== +See https://github.com/openstack/monasca-common/tree/master/docker/README.rst + + +Building Monasca Client image +============================= + +Example: + $ ./build_image.sh <repository_version> <upper_constains_branch> <common_version> + + +Requirements from monasca-base image +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +health_check.py + This file will be used for checking the status of the Monasca API + application. + + +Scripts +~~~~~~~ +start.sh + In this starting script provide all steps that lead to the proper service + start. Including usage of wait scripts and templating of configuration + files. You also could provide the ability to allow running container after + service died for easier debugging. + +build_image.sh + Please read detailed build description inside the script. + + +Docker Compose +~~~~~~~~~~~~~~ +When you want to use docker-compose add it as a new service and be sure that +property 'tty' is set to true to avoid exiting of container after startup. +Example: + + * monasca-client: + * image: monasca/client:master + * tty: true + +Running +~~~~~~~ +If you don't want to use docker-compose mechanism, you can run container manually +and connect it to existing docker Monasca network. +Example: + docker network --network=<network-name> <container_name> + +You can also use docker run option to start a container and connect it to a network immediately: +Example: + docker run -itd --network=<network-name> <container-name> + +Inside of container it is possible to run 'monasca' shell commands, e.g. to list all metrics. +Example: + monasca metric-list + +Links +~~~~~ +https://docs.openstack.org/python-monascaclient/latest/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-monascaclient-1.15.0/docker/build_image.sh new/python-monascaclient-1.16.0/docker/build_image.sh --- old/python-monascaclient-1.15.0/docker/build_image.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/python-monascaclient-1.16.0/docker/build_image.sh 2019-09-13 18:07:46.000000000 +0200 @@ -0,0 +1,150 @@ +#!/bin/bash + +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +# TODO(Dobroslaw): move this script to monasca-common/docker folder +# and leave here small script to download it and execute using env variables +# to minimize code duplication. + +set -x # Print each script step. +set -eo pipefail # Exit the script if any statement returns error. + +# This script is used for building Docker image with proper labels +# and proper version of monasca-common. +# +# Example usage: +# $ ./build_image.sh <repository_version> <upper_constains_branch> <common_version> +# +# Everything after `./build_image.sh` is optional and by default configured +# to get versions from `Dockerfile`. +# +# To build from master branch (default): +# $ ./build_image.sh +# To build specific version run this script in the following way: +# $ ./build_image.sh stable/queens +# Building from specific commit: +# $ ./build_image.sh cb7f226 +# When building from a tag monasca-common will be used in version available +# in upper constraint file: +# $ ./build_image.sh 2.5.0 +# To build image from Gerrit patch sets that is targeting branch stable/queens: +# $ ./build_image.sh refs/changes/51/558751/1 stable/queens +# +# If you want to build image with custom monasca-common version you need +# to provide it as in the following example: +# $ ./build_image.sh master master refs/changes/19/595719/3 + +# Go to folder with Docker files. +REAL_PATH=$(python -c "import os,sys; print(os.path.realpath('$0'))") +cd "$(dirname "$REAL_PATH")/../docker/" + +[ -z "$DOCKER_IMAGE" ] && \ + DOCKER_IMAGE=$(\grep DOCKER_IMAGE Dockerfile | cut -f2 -d"=") + +: "${REPO_VERSION:=$1}" +[ -z "$REPO_VERSION" ] && \ + REPO_VERSION=$(\grep REPO_VERSION Dockerfile | cut -f2 -d"=") +# Let's stick to more readable version and disable SC2001 here. +# shellcheck disable=SC2001 +REPO_VERSION_CLEAN=$(echo "$REPO_VERSION" | sed 's|/|-|g') + +[ -z "$APP_REPO" ] && APP_REPO=$(\grep APP_REPO Dockerfile | cut -f2 -d"=") +GITHUB_REPO=$(echo "$APP_REPO" | sed 's/review.opendev.org/github.com/' | \ + sed 's/ssh:/https:/') + +if [ -z "$CONSTRAINTS_FILE" ]; then + CONSTRAINTS_FILE=$(\grep CONSTRAINTS_FILE Dockerfile | cut -f2 -d"=") || true + : "${CONSTRAINTS_FILE:=https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}" +fi + +: "${CONSTRAINTS_BRANCH:=$2}" +[ -z "$CONSTRAINTS_BRANCH" ] && \ + CONSTRAINTS_BRANCH=$(\grep CONSTRAINTS_BRANCH Dockerfile | cut -f2 -d"=") + +# When using stable version of repository use same stable constraints file. +case "$REPO_VERSION" in + *stable*) + CONSTRAINTS_BRANCH_CLEAN="$REPO_VERSION" + CONSTRAINTS_FILE=${CONSTRAINTS_FILE/master/$CONSTRAINTS_BRANCH_CLEAN} + # Get monasca-common version from stable upper constraints file. + CONSTRAINTS_TMP_FILE=$(mktemp) + wget --output-document "$CONSTRAINTS_TMP_FILE" \ + $CONSTRAINTS_FILE + UPPER_COMMON=$(\grep 'monasca-common' "$CONSTRAINTS_TMP_FILE") + # Get only version part from monasca-common. + UPPER_COMMON_VERSION="${UPPER_COMMON##*===}" + rm -rf "$CONSTRAINTS_TMP_FILE" + ;; + *) + CONSTRAINTS_BRANCH_CLEAN="$CONSTRAINTS_BRANCH" + ;; +esac + +# Monasca-common variables. +if [ -z "$COMMON_REPO" ]; then + COMMON_REPO=$(\grep COMMON_REPO Dockerfile | cut -f2 -d"=") || true + : "${COMMON_REPO:=https://review.opendev.org/openstack/monasca-common}" +fi +: "${COMMON_VERSION:=$3}" +if [ -z "$COMMON_VERSION" ]; then + COMMON_VERSION=$(\grep COMMON_VERSION Dockerfile | cut -f2 -d"=") || true + if [ "$UPPER_COMMON_VERSION" ]; then + # Common from upper constraints file. + COMMON_VERSION="$UPPER_COMMON_VERSION" + fi +fi + +# Clone project to temporary directory for getting proper commit number from +# branches and tags. We need this for setting proper image labels. +# Docker does not allow to get any data from inside of system when building +# image. +TMP_DIR=$(mktemp -d) +( + cd "$TMP_DIR" + # This many steps are needed to support gerrit patch sets. + git init + git remote add origin "$APP_REPO" + git fetch origin "$REPO_VERSION" + git reset --hard FETCH_HEAD +) +GIT_COMMIT=$(git -C "$TMP_DIR" rev-parse HEAD) +[ -z "${GIT_COMMIT}" ] && echo "No git commit hash found" && exit 1 +rm -rf "$TMP_DIR" + +# Do the same for monasca-common. +COMMON_TMP_DIR=$(mktemp -d) +( + cd "$COMMON_TMP_DIR" + # This many steps are needed to support gerrit patch sets. + git init + git remote add origin "$COMMON_REPO" + git fetch origin "$COMMON_VERSION" + git reset --hard FETCH_HEAD +) +COMMON_GIT_COMMIT=$(git -C "$COMMON_TMP_DIR" rev-parse HEAD) +[ -z "${COMMON_GIT_COMMIT}" ] && echo "No git commit hash found" && exit 1 +rm -rf "$COMMON_TMP_DIR" + +CREATION_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ") + +docker build --no-cache \ + --build-arg CREATION_TIME="$CREATION_TIME" \ + --build-arg GITHUB_REPO="$GITHUB_REPO" \ + --build-arg APP_REPO="$APP_REPO" \ + --build-arg REPO_VERSION="$REPO_VERSION" \ + --build-arg GIT_COMMIT="$GIT_COMMIT" \ + --build-arg CONSTRAINTS_FILE="$CONSTRAINTS_FILE" \ + --build-arg COMMON_REPO="$COMMON_REPO" \ + --build-arg COMMON_VERSION="$COMMON_VERSION" \ + --build-arg COMMON_GIT_COMMIT="$COMMON_GIT_COMMIT" \ + --tag "$DOCKER_IMAGE":"$REPO_VERSION_CLEAN" . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-monascaclient-1.15.0/docker/health_check.py new/python-monascaclient-1.16.0/docker/health_check.py --- old/python-monascaclient-1.15.0/docker/health_check.py 1970-01-01 01:00:00.000000000 +0100 +++ new/python-monascaclient-1.16.0/docker/health_check.py 2019-09-13 18:07:46.000000000 +0200 @@ -0,0 +1,26 @@ +#!/usr/bin/env python +# coding=utf-8 + +# (C) Copyright 2018 FUJITSU LIMITED +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +"""Health check will returns 0 when service is working properly.""" + + +def main(): + """No health check for python client""" + return 0 + + +if __name__ == '__main__': + main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-monascaclient-1.15.0/docker/start.sh new/python-monascaclient-1.16.0/docker/start.sh --- old/python-monascaclient-1.15.0/docker/start.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/python-monascaclient-1.16.0/docker/start.sh 2019-09-13 18:07:46.000000000 +0200 @@ -0,0 +1,8 @@ +#!/bin/sh + +# Test services we need before starting our service. +echo "Start script: waiting for needed services" +python3 /kafka_wait_for_topics.py +python3 /mysql_check.py + +./wait_for.sh "$MONASCA_URI" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-monascaclient-1.15.0/playbooks/docker-publish.yml new/python-monascaclient-1.16.0/playbooks/docker-publish.yml --- old/python-monascaclient-1.15.0/playbooks/docker-publish.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/python-monascaclient-1.16.0/playbooks/docker-publish.yml 2019-09-13 18:07:46.000000000 +0200 @@ -0,0 +1,12 @@ +--- +- hosts: all + tasks: + - name: Login to Dockerhub + command: "docker login -u {{ doker_hub_login_client.user }} -p {{ doker_hub_login_client.password }}" + no_log: true + + - name: List images + shell: "docker images --format '{% raw %}{{ .Repository }}:{{ .Tag }}{% endraw %}' | grep monasca" + + - name: Push to Docker Hub all tags + shell: "docker push monasca/client" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-monascaclient-1.15.0/python_monascaclient.egg-info/PKG-INFO new/python-monascaclient-1.16.0/python_monascaclient.egg-info/PKG-INFO --- old/python-monascaclient-1.15.0/python_monascaclient.egg-info/PKG-INFO 2019-05-09 16:08:21.000000000 +0200 +++ new/python-monascaclient-1.16.0/python_monascaclient.egg-info/PKG-INFO 2019-09-13 18:08:49.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: python-monascaclient -Version: 1.15.0 +Version: 1.16.0 Summary: Monasca API Client Library Home-page: https://docs.openstack.org/python-monascaclient/latest/ Author: OpenStack @@ -35,7 +35,7 @@ .. _PyPi: https://pypi.python.org/pypi/python-monascaclient .. _Online Documentation: https://docs.openstack.org/python-monascaclient/latest/ .. _Bugs: https://storyboard.openstack.org/#!/project/880 - .. _Source: https://git.openstack.org/cgit/openstack/python-monascaclient + .. _Source: https://opendev.org/openstack/python-monascaclient Platform: UNKNOWN @@ -48,5 +48,5 @@ Classifier: Programming Language :: Python :: 2 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.5 Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-monascaclient-1.15.0/python_monascaclient.egg-info/SOURCES.txt new/python-monascaclient-1.16.0/python_monascaclient.egg-info/SOURCES.txt --- old/python-monascaclient-1.15.0/python_monascaclient.egg-info/SOURCES.txt 2019-05-09 16:08:21.000000000 +0200 +++ new/python-monascaclient-1.16.0/python_monascaclient.egg-info/SOURCES.txt 2019-09-13 18:08:49.000000000 +0200 @@ -21,6 +21,11 @@ doc/source/cli/monasca.rst doc/source/reference/index.rst doc/source/usage/index.rst +docker/Dockerfile +docker/README.rst +docker/build_image.sh +docker/health_check.py +docker/start.sh monascaclient/__init__.py monascaclient/client.py monascaclient/shell.py @@ -47,6 +52,7 @@ monascaclient/v2_0/notifications.py monascaclient/v2_0/notificationtypes.py monascaclient/v2_0/shell.py +playbooks/docker-publish.yml python_monascaclient.egg-info/PKG-INFO python_monascaclient.egg-info/SOURCES.txt python_monascaclient.egg-info/dependency_links.txt @@ -61,4 +67,5 @@ releasenotes/source/index.rst releasenotes/source/queens.rst releasenotes/source/rocky.rst +releasenotes/source/stein.rst releasenotes/source/unreleased.rst \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-monascaclient-1.15.0/python_monascaclient.egg-info/pbr.json new/python-monascaclient-1.16.0/python_monascaclient.egg-info/pbr.json --- old/python-monascaclient-1.15.0/python_monascaclient.egg-info/pbr.json 2019-05-09 16:08:21.000000000 +0200 +++ new/python-monascaclient-1.16.0/python_monascaclient.egg-info/pbr.json 2019-09-13 18:08:49.000000000 +0200 @@ -1 +1 @@ -{"git_version": "bcb16d1", "is_release": true} \ No newline at end of file +{"git_version": "3b9ec11", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-monascaclient-1.15.0/releasenotes/source/index.rst new/python-monascaclient-1.16.0/releasenotes/source/index.rst --- old/python-monascaclient-1.15.0/releasenotes/source/index.rst 2019-05-09 16:06:09.000000000 +0200 +++ new/python-monascaclient-1.16.0/releasenotes/source/index.rst 2019-09-13 18:07:46.000000000 +0200 @@ -8,5 +8,6 @@ :maxdepth: 1 unreleased + stein rocky queens diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-monascaclient-1.15.0/releasenotes/source/stein.rst new/python-monascaclient-1.16.0/releasenotes/source/stein.rst --- old/python-monascaclient-1.15.0/releasenotes/source/stein.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/python-monascaclient-1.16.0/releasenotes/source/stein.rst 2019-09-13 18:07:46.000000000 +0200 @@ -0,0 +1,6 @@ +=================================== + Stein Series Release Notes +=================================== + +.. release-notes:: + :branch: stable/stein diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-monascaclient-1.15.0/setup.cfg new/python-monascaclient-1.16.0/setup.cfg --- old/python-monascaclient-1.15.0/setup.cfg 2019-05-09 16:08:21.000000000 +0200 +++ new/python-monascaclient-1.16.0/setup.cfg 2019-09-13 18:08:49.000000000 +0200 @@ -15,8 +15,8 @@ Programming Language :: Python :: 2 Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 [files] packages = monascaclient diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-monascaclient-1.15.0/tox.ini new/python-monascaclient-1.16.0/tox.ini --- old/python-monascaclient-1.15.0/tox.ini 2019-05-09 16:06:09.000000000 +0200 +++ new/python-monascaclient-1.16.0/tox.ini 2019-09-13 18:07:46.000000000 +0200 @@ -1,5 +1,5 @@ [tox] -envlist = py{27,35,36},pypy,cover,pep8 +envlist = py27,py37,pypy,cover,pep8 minversion = 2.5 skipsdist = True @@ -13,7 +13,7 @@ usedevelop = True install_command = pip install {opts} {packages} deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/stein} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt whitelist_externals = bash