Update Heat build scripts

Version: 1:6.0.0~rc1-1~u14.04+mos1

* Source: https://anonscm.debian.org/git/openstack/heat.git
  Commit: be5af7fa39de8fd3ceb2261b73b77f248afe6b36
* d/control: Fix (build-) dependencies.

Change-Id: I8b4d1163a309f46ea1c46077a42acdb6cba31c3a

diff --git a/centos7/rpm/SPECS/openstack-heat.spec b/centos7/rpm/SPECS/openstack-heat.spec
index 30ec10fc44747f718848b149cb1de54f9a17fad3..cf8f0962578d3aa3b6faff3842bc25374ba8dd7f 100644 (file)
--- a/centos7/rpm/SPECS/openstack-heat.spec
+++ b/centos7/rpm/SPECS/openstack-heat.spec
@@ -5,8 +5,8 @@ Summary:        OpenStack Orchestration (heat)
 # Liberty semver reset
 # https://review.openstack.org/#/q/I6a35fa0dda798fad93b804d00a46af80f08d475c,n,z
 Epoch:         1
-Version:       5.0.0.0rc1
-Release:       2%{?dist}~mos8.0.2
+Version:       6.0.0.0rc1
+Release:       1%{?dist}
 License:       ASL 2.0
 URL:           http://www.openstack.org
 Source0:       http://tarballs.openstack.org/heat/heat-master.tar.gz
@@ -321,6 +321,7 @@ OpenStack-native ReST API to the Heat Engine
 %files api
 %doc README.rst LICENSE
 %{_bindir}/heat-api
+%{_bindir}/heat-wsgi-api
 %{_unitdir}/openstack-heat-api.service
 
 %post api
@@ -348,6 +349,7 @@ AWS CloudFormation-compatible API to the Heat Engine
 %files api-cfn
 %doc README.rst LICENSE
 %{_bindir}/heat-api-cfn
+%{_bindir}/heat-wsgi-api-cfn
 %{_unitdir}/openstack-heat-api-cfn.service
 
 %post api-cfn
@@ -375,6 +377,7 @@ AWS CloudWatch-compatible API to the Heat Engine
 %files api-cloudwatch
 %doc README.rst LICENSE
 %{_bindir}/heat-api-cloudwatch
+%{_bindir}/heat-wsgi-api-cloudwatch
 %{_unitdir}/openstack-heat-api-cloudwatch.service
 
 %files doc
@@ -392,6 +395,9 @@ AWS CloudWatch-compatible API to the Heat Engine
 
 
 %changelog
+* Mon Mar 28 2016 Ivan Udovichenko <iudovichenko@mirantis.com> 1:6.0.0.0rc1-1%{?dist}
+- Add heat-wsgi-api, heat-wsgi-api-cfn, heat-wsgi-api-cloudwatch binaries to its packages.
+
 * Thu Oct  8 2015 Daniil Trishkin <dtrishkin@mirantis.com> - 1:5.0.0.0rc1-1%{?dist}~mos8.0.2
 - Add doc package and move all documentation to it
 

diff --git a/tests/runtests.sh b/tests/runtests.sh
index 1cbf211b362381fd9c7131476eb2d0136383a719..441354d933a4b0cc904b52e9617748b030fc630a 100755 (executable)
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -71,7 +71,7 @@ prepare_vm() {
         OS_ID="Ubuntu"
         echo "mysql-server mysql-server/root_password select $ROOT_MYSQL_PASSWORD" | sudo debconf-set-selections
         echo "mysql-server mysql-server/root_password_again select $ROOT_MYSQL_PASSWORD" | sudo debconf-set-selections
-        apt-get install -y mysql-server mysql-client python-mysqldb rabbitmq-server screen curl
+        apt-get install --yes --force-yes mysql-server mysql-client python-mysqldb rabbitmq-server screen curl
     else
         OS_ID="Centos"
         setenforce 0 |:
@@ -96,18 +96,19 @@ prepare_vm() {
                GRANT ALL PRIVILEGES ON $_mysql_db_name.* TO '$_mysql_db_user'@'%' IDENTIFIED BY '$_mysql_db_pass';"
     mysql -uroot -p$_mysql_root_pass -e "$_mysql_cmd" |:
     DAEMON_DB_CONSTR="mysql://$_mysql_db_user:$_mysql_db_pass@127.0.0.1:3306/$_mysql_db_name"
-    iniset $conf_file database connection ${DAEMON_DB_CONSTR}
     iniset $conf_file DEFAULT debug 'True'
     iniset $conf_file DEFAULT verbose 'True'
     iniset $conf_file DEFAULT use_syslog 'False'
     iniset $conf_file DEFAULT log_dir /var/log/heat
-
+    iniset $conf_file database connection ${DAEMON_DB_CONSTR}
+    sleep 1
     heat-manage -d --config-file $conf_file db_sync
     if [ "$?" != "0" ]
     then
         echo "Couldn't execute 'heat-manage db_sync'"
         RES=1
     fi
+    sleep 1
 }
 
 case $package in
@@ -181,7 +182,10 @@ case $package in
     ;;
     heat-engine|openstack-heat-engine)
         prepare_vm
-        log_file='/var/log/heat/heat-engine.log'
+        # Do not use default log file due to bug/1562753
+        # Revert changes after clean DB synchronization.
+        # log_file='/var/log/heat/heat-engine.log'
+        log_file='/var/log/heat/heat-engine_bogus.log'
         case ${OS_ID} in
             'Ubuntu')
                 screen -dmS heat-engine
@@ -202,22 +206,31 @@ case $package in
         if [ "$trace_count" -ne "0" ]
         then
             echo "Something went wrong! Log file have trace errors! Check logs"
+            cat $log_file
             RES=1
         else
-            rabbit_connections=`cat $log_file | grep -E '(Reco|Co)nnected to AMQP server on' | wc -l`
-            if [ "$rabbit_connections" -eq "0" ]
-            then
-                echo "Heat Engine: Can't connected to RabbitMQ"
-                RES=1
+            amqp_errors=$(grep -P '\[Errno 111\] ECONNREFUSED' $log_file | wc -l)
+            if [ $amqp_errors -gt 0 ]; then
+                if [ $(grep -P '(\[Errno 111\] ECONNREFUSED|(Reconnected|Connected) to AMQP server)' $log_file \
+                          | tail -1 | grep -P '(Reconnected|Connected) to AMQP server' | wc -l) -eq 1 ]; then
+                    echo 'Heat-engine is connected to AMQP server'
+                else
+                    cat $log_file
+                    echo 'Heat-engine is not connected to AMQP server'
+                    RES=1
+                fi
             else
-                echo "Heat Engine successfully started"
+                echo 'Heat-engine is connected to AMQP server'
             fi
         fi
         systemctl stop openstack-heat-engine
     ;;
     heat-docker|openstack-heat-docker)
         prepare_vm
-        log_file='/var/log/heat/heat-engine.log'
+        # Do not use default log file due to bug/1562753
+        # Revert changes after clean DB synchronization.
+        # log_file='/var/log/heat/heat-engine.log'
+        log_file='/var/log/heat/heat-engine_bogus.log'
         case ${OS_ID} in
             'Ubuntu')
                 screen -dmS heat-engine
@@ -238,6 +251,7 @@ case $package in
         if [ "$trace_count" -ne "0" ]
         then
             echo "Something went wrong! Log file have trace errors! Check logs"
+            cat $log_file
             RES=1
         else
             docker_regitered=$(grep -c 'DockerInc::Docker::Container' $log_file)

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index f2b4822168384b0a8fd356b516df66147ff23223..c6293b2d306a62a3fdadba60e736975d006b896d 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,31 @@
+heat (1:6.0.0~rc1-1~u14.04+mos1) mos9.0; urgency=medium
+
+  * Source: https://anonscm.debian.org/git/openstack/heat.git
+    Commit: be5af7fa39de8fd3ceb2261b73b77f248afe6b36
+  * d/control: Fix (build-) dependencies.
+
+ -- Ivan Udovichenko <iudovichenko@mirantis.com>  Thu, 24 Mar 2016 11:39:34 +0200
+
+heat (1:6.0.0~rc1-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Added git as build-depends-indep.
+  * Fixed (build-)depends for this release.
+
+ -- Thomas Goirand <zigo@debian.org>  Tue, 22 Mar 2016 13:25:50 +0100
+
+heat (1:6.0.0~b3-1) experimental; urgency=medium
+
+  [ Thomas Goirand ]
+  * New upstream release.
+  * Avoid option -S of dpkg-parsechangelog which is incompatible with Trusty.
+  * Fixed (build-)depends for this release.
+
+  [ Ondřej Nový ]
+  * Fixed VCS URLs (https).
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 25 Jan 2016 16:05:12 +0000
+
 heat (1:6.0.0~b2-2~u14.04+mos1) mos9.0; urgency=medium
 
   * Restore heat-docker package

diff --git a/trusty/debian/control b/trusty/debian/control
index 46454d2c7283f3f46d62c1630d86a2d23ab9eb05..630b8ab567013c54af4a78ae31127f852be02202 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -10,30 +10,30 @@ Build-Depends: debhelper (>= 9),
                po-debconf,
                python-all,
                python-pbr (>= 1.8),
-               python-setuptools,
+               python-setuptools (>= 16.0),
                python-sphinx (>= 1.1.2),
 Build-Depends-Indep: bandit (>= 0.13.2),
                      git,
-                     python-babel,
+                     python-babel (>= 1.3),
                      python-barbicanclient (>= 3.3.0),
                      python-ceilometerclient (>= 2.2.1),
                      python-cinderclient (>= 1:1.3.1),
-                     python-croniter,
+                     python-croniter (>= 0.3.4),
                      python-coverage (>= 3.6),
-                     python-crypto,
+                     python-crypto (>= 2.6),
                      python-cryptography (>= 1.0),
                      python-debtcollector (>= 1.2.0),
                      python-designateclient (>= 1.5.0),
-                     python-eventlet (>= 0.17.4),
-                     python-glanceclient (>= 1:1.2.0),
-                     python-greenlet,
-                     python-hacking (>= 0.10.0),
+                     python-eventlet (>= 0.18.2),
+                     python-glanceclient (>= 1:2.0.0),
+                     python-greenlet (>= 0.3.2),
+                     python-hacking (>= 0.10.2),
                      python-heatclient (>= 0.6.0),
                      python-keystoneclient (>= 1:1.6.0),
                      python-keystonemiddleware (>= 4.0.0),
-                     python-kombu (>= 3.0.7),
-                     python-lxml,
-                     python-magnumclient,
+                     python-kombu (>= 3.0.25),
+                     python-lxml (>= 2.3),
+                     python-magnumclient (>= 0.2.1),
                      python-manilaclient (>= 1.3.0),
                      python-migrate (>= 0.9.6),
                      python-mistralclient (>= 1.0.0),
@@ -43,52 +43,52 @@ Build-Depends-Indep: bandit (>= 0.13.2),
                      python-netaddr (>= 0.7.12),
                      python-neutronclient (>= 1:2.6.0),
                      python-novaclient (>= 2:2.29.0),
-                     python-openstackclient (>= 2.0.0),
+                     python-openstackclient (>= 2.1.0),
                      python-oslo.cache (>= 1.0.0),
-                     python-oslo.concurrency (>= 2.3.0),
-                     python-oslo.config (>= 1:3.2.0),
+                     python-oslo.concurrency (>= 3.5.0),
+                     python-oslo.config (>= 1:3.7.0),
                      python-oslo.context (>= 0.2.0),
                      python-oslo.db (>= 4.1.0),
-                     python-oslo.i18n (>= 1.5.0),
+                     python-oslo.i18n (>= 2.1.0),
                      python-oslo.log (>= 2.0.0),
-                     python-oslo.messaging (>= 3.0.0),
+                     python-oslo.messaging (>= 4.0.0),
                      python-oslo.middleware (>= 3.0.0),
                      python-oslo.policy (>= 0.5.0),
                      python-oslo.reports (>= 1.0.0),
                      python-oslo.serialization (>= 2.0.0),
                      python-oslo.service (>= 1.0.0),
-                     python-oslo.utils (>= 3.4.0),
-                     python-oslo.versionedobjects (>= 1.0.0),
+                     python-oslo.utils (>= 3.5.0),
+                     python-oslo.versionedobjects (>= 1.5.0),
                      python-oslosphinx (>= 2.5.0),
                      python-oslotest (>= 1.10.0),
-                     python-osprofiler (>= 0.4.0),
-                     python-paramiko (>= 1.13.0),
-                     python-pastedeploy,
+                     python-osprofiler (>= 1.1.0),
+                     python-paramiko (>= 1.16.0),
+                     python-pastedeploy (>= 1.5.0),
                      python-psycopg2 (>= 2.5),
                      python-pymysql (>= 0.6.2),
                      python-qpid,
                      python-reno (>= 0.1.1),
                      python-requests (>= 2.8.1),
-                     python-routes,
-                     python-saharaclient (>= 0.10.0),
+                     python-routes (>= 1.12.3),
+                     python-saharaclient (>= 0.13.0),
                      python-senlinclient,
                      python-six (>= 1.9.0),
                      python-sqlalchemy (>= 1.0.10),
                      python-stevedore (>= 1.5.0),
-                     python-swiftclient,
+                     python-swiftclient (>= 2.2.0),
                      python-testscenarios (>= 0.4),
                      python-testresources (>= 0.2.4),
                      python-testtools (>= 1.4.0),
                      python-troveclient (>= 1:1.2.0),
-                     python-tz,
-                     python-webob,
+                     python-tz (>= 2013.6),
+                     python-webob (>= 1.2.3),
                      python-yaml,
                      python-zaqarclient (>= 0.3.0),
                      subunit,
                      testrepository,
 Standards-Version: 3.9.6
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/heat.git;a=summary
-Vcs-Git: git://anonscm.debian.org/openstack/heat.git
+Vcs-Browser: https://anonscm.debian.org/cgit/openstack/heat.git/
+Vcs-Git: https://anonscm.debian.org/git/openstack/heat.git
 Homepage: http://wiki.openstack.org/Heat
 
 Package: python-heat
@@ -99,12 +99,12 @@ Depends: python-babel (>= 1.3),
          python-ceilometerclient (>= 2.2.1),
          python-cinderclient (>= 1:1.3.1),
          python-croniter (>= 0.3.4),
-         python-crypto,
+         python-crypto (>= 2.6),
          python-cryptography (>= 1.0),
          python-debtcollector (>= 1.2.0),
          python-designateclient (>= 1.5.0),
-         python-eventlet (>= 0.17.4),
-         python-glanceclient (>= 1:1.2.0),
+         python-eventlet (>= 0.18.2),
+         python-glanceclient (>= 1:2.0.0),
          python-greenlet (>= 0.3.2),
          python-heatclient (>= 0.6.0),
          python-keystoneclient (>= 1:1.6.0),
@@ -119,10 +119,10 @@ Depends: python-babel (>= 1.3),
          python-netaddr (>= 0.7.12),
          python-neutronclient (>= 1:2.6.0),
          python-novaclient (>= 2:2.29.0),
-         python-openstackclient (>= 2.0.0),
+         python-openstackclient (>= 2.1.0),
          python-oslo.cache (>= 1.0.0),
-         python-oslo.concurrency (>= 2.3.0),
-         python-oslo.config (>= 1:3.2.0),
+         python-oslo.concurrency (>= 3.5.0),
+         python-oslo.config (>= 1:3.7.0),
          python-oslo.context (>= 0.2.0),
          python-oslo.db (>= 4.1.0),
          python-oslo.i18n (>= 2.1.0),
@@ -133,16 +133,17 @@ Depends: python-babel (>= 1.3),
          python-oslo.reports (>= 1.0.0),
          python-oslo.serialization (>= 2.0.0),
          python-oslo.service (>= 1.0.0),
-         python-oslo.utils (>= 3.4.0),
-         python-oslo.versionedobjects (>= 1.4.0),
-         python-osprofiler (>= 0.4.0),
+         python-oslo.utils (>= 3.5.0),
+         python-oslo.versionedobjects (>= 1.5.0),
+         python-osprofiler (>= 1.1.0),
          python-pastedeploy (>= 1.5.0),
          python-pbr (>= 1.8),
          python-psycopg2 (>= 2.5),
          python-pymysql (>= 0.6.2),
          python-requests (>= 2.8.1),
+         python-retrying (>= 1.2.3),
          python-routes (>= 1.12.3),
-         python-saharaclient (>= 0.10.0),
+         python-saharaclient (>= 0.13.0),
          python-senlinclient,
          python-six (>= 1.9.0),
          python-sqlalchemy (>= 1.0.10),
@@ -249,8 +250,8 @@ Description: OpenStack orchestration service - Documentation
 Package: heat-docker
 Architecture: all
 Depends:
- python-docker (>= 1.4.0),
- heat-engine (=${binary:Version}),
+ python-docker (>= 1.6.0),
+ heat-engine (= ${binary:Version}),
  ${misc:Depends},
  ${ostack-lsb-base},
  ${python:Depends}

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 5f449d074eb8139b6e2224099a527bfa019cf260..d96c22d5bd866f820570a9b95352cb7062bb8bcc 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -4,7 +4,7 @@ PYTHONS:=$(shell pyversions -vr)
 #PYTHON3S:=$(shell py3versions -vr)
 
 include /usr/share/openstack-pkg-tools/pkgos.make
-export OSLO_PACKAGE_VERSION=$(shell dpkg-parsechangelog -S Version | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/')
+export OSLO_PACKAGE_VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d' ' -f2 | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/')
 
 %:
        dh $@ --buildsystem=python_distutils --with python2,sphinxdoc,systemd