diff -Nru murano-dashboard-5.0.0~b2/AUTHORS murano-dashboard-5.0.0/AUTHORS --- murano-dashboard-5.0.0~b2/AUTHORS 2017-12-13 11:02:31.000000000 +0000 +++ murano-dashboard-5.0.0/AUTHORS 2018-02-28 11:32:59.000000000 +0000 @@ -2,6 +2,7 @@ Akanksha Akihiro Motoki Akihiro Motoki +Aleksey Nakoryakov Alexander Gromov Alexander Koryagin Alexander Shlykov diff -Nru murano-dashboard-5.0.0~b2/ChangeLog murano-dashboard-5.0.0/ChangeLog --- murano-dashboard-5.0.0~b2/ChangeLog 2017-12-13 11:02:31.000000000 +0000 +++ murano-dashboard-5.0.0/ChangeLog 2018-02-28 11:32:59.000000000 +0000 @@ -1,6 +1,38 @@ CHANGES ======= +5.0.0 +----- + +* Imported Translations from Zanata +* Imported Translations from Zanata +* Update UPPER\_CONSTRAINTS\_FILE for stable/queens +* Update .gitreview for stable/queens + +5.0.0.0rc1 +---------- + +* Imported Translations from Zanata +* Zuul: Remove project name +* Imported Translations from Zanata + +5.0.0.0b3 +--------- + +* Imported Translations from Zanata +* Updated from global requirements +* Add murano dashboard selenium functional test +* Updated from global requirements +* Show resource usages for application +* Updated from global requirements +* Imported Translations from Zanata +* Imported Translations from Zanata +* Updated from global requirements +* Murano dashboard imports heat.py from Heat dashboard +* Imported Translations from Zanata +* Imported Translations from Zanata +* Imported Translations from Zanata + 5.0.0.0b2 --------- diff -Nru murano-dashboard-5.0.0~b2/debian/changelog murano-dashboard-5.0.0/debian/changelog --- murano-dashboard-5.0.0~b2/debian/changelog 2017-12-13 21:42:25.000000000 +0000 +++ murano-dashboard-5.0.0/debian/changelog 2018-03-15 00:57:22.000000000 +0000 @@ -1,3 +1,37 @@ +murano-dashboard (1:5.0.0-0ubuntu1.1) bionic; urgency=medium + + * d/python-murano-dashboard.postinst: Ensure /var/lib/openstack-dashboard + exists before chown. + + -- Corey Bryant Wed, 14 Mar 2018 20:57:22 -0400 + +murano-dashboard (1:5.0.0-0ubuntu1) bionic; urgency=medium + + * New upstream release for OpenStack Queens. + + -- Corey Bryant Wed, 28 Feb 2018 15:23:19 -0500 + +murano-dashboard (1:5.0.0~rc2-0ubuntu1) bionic; urgency=medium + + * New upstream release candidate for OpenStack Queens. + + -- Corey Bryant Mon, 26 Feb 2018 17:58:56 -0500 + +murano-dashboard (1:5.0.0~rc1-0ubuntu1) bionic; urgency=medium + + * New upstream release candidate for OpenStack Queens. + + -- Corey Bryant Wed, 14 Feb 2018 12:07:39 -0500 + +murano-dashboard (1:5.0.0~b3-0ubuntu1) bionic; urgency=medium + + * New upstream milestone for OpenStack Queens. + * d/control: Align (Build-)Depends with upstream. + * d/python-murano-dashboard.postinst: Align with horizon and other + dashboards by switching to using horizon instead of www-data. + + -- Corey Bryant Fri, 26 Jan 2018 12:37:18 -0500 + murano-dashboard (1:5.0.0~b2-0ubuntu1) bionic; urgency=medium * New upstream milestone for OpenStack Queens. diff -Nru murano-dashboard-5.0.0~b2/debian/control murano-dashboard-5.0.0/debian/control --- murano-dashboard-5.0.0~b2/debian/control 2017-12-13 21:42:25.000000000 +0000 +++ murano-dashboard-5.0.0/debian/control 2018-03-15 00:57:22.000000000 +0000 @@ -14,30 +14,31 @@ python-setuptools, python-sphinx (>= 1.6.2), Build-Depends-Indep: - openstack-dashboard (>= 3:12.0.0), + openstack-dashboard (>= 3:13.0.0~b3~), python-babel (>= 2.3.4), python-beautifulsoup, - python-bs4, - python-castellan (>= 0.14.0), + python-bs4 (>= 4.6.0), + python-castellan (>= 0.16.0), python-coverage (>= 4.0), python-django (>= 1.8), python-django-babel (>= 0.5.1), python-django-compressor (>= 2.0), - python-django-formtools, + python-django-formtools (>= 1.0), python-django-horizon, python-django-nose (>= 1.4.4), python-hacking (>= 0.12.0), + python-heat-dashboard (>= 1.0.0), python-iso8601 (>= 0.1.11), python-mock (>= 2.0.0), python-mox3 (>= 0.20.0), python-muranoclient (>= 0.8.2), - python-nose, + python-nose (>= 1.3.7), python-nose-exclude, python-nosehtmloutput (>= 0.0.3), python-openstack.nose-plugin (>= 0.7), - python-openstackdocstheme (>= 1.17.0), + python-openstackdocstheme (>= 1.18.1), python-oslo.config (>= 1:5.1.0), - python-oslo.log (>= 3.30.0), + python-oslo.log (>= 3.36.0), python-selenium (>= 2.50.1), python-semantic-version (>= 2.3.1), python-six (>= 1.10.0), @@ -53,18 +54,19 @@ Package: python-murano-dashboard Architecture: all Depends: - openstack-dashboard (>= 3:12.0.0), + openstack-dashboard (>= 3:13.0.0~b3~), python-babel (>= 2.3.4), python-beautifulsoup, - python-bs4, - python-castellan (>= 0.14.0), + python-bs4 (>= 4.6.0), + python-castellan (>= 0.16.0), python-django (>= 1.8), python-django-babel (>= 0.5.1), python-django-compressor (>= 2.0), - python-django-formtools, + python-django-formtools (>= 1.0), + python-heat-dashboard (>= 1.0.0), python-iso8601 (>= 0.1.11), python-muranoclient (>= 0.8.2), - python-oslo.log (>= 3.30.0), + python-oslo.log (>= 3.36.0), python-pbr (>= 2.0.0), python-semantic-version (>= 2.3.1), python-six (>= 1.10.0), diff -Nru murano-dashboard-5.0.0~b2/debian/python-murano-dashboard.postinst murano-dashboard-5.0.0/debian/python-murano-dashboard.postinst --- murano-dashboard-5.0.0~b2/debian/python-murano-dashboard.postinst 2017-12-13 21:42:25.000000000 +0000 +++ murano-dashboard-5.0.0/debian/python-murano-dashboard.postinst 2018-03-15 00:57:22.000000000 +0000 @@ -12,12 +12,8 @@ rm /var/lib/openstack-dashboard/secret-key/.secret_key_store fi - if [ -d /var/lib/openstack-dashboard/secret-key ]; then - chown -R www-data /var/lib/openstack-dashboard/secret-key - fi - - if [ -d /var/lib/openstack-dashboard/static ]; then - chown -R www-data /var/lib/openstack-dashboard/static + if [ -d /var/lib/openstack-dashboard ]; then + chown -R horizon:horizon /var/lib/openstack-dashboard fi DSHB_SETTINGS_LOC='/etc/openstack-dashboard/local_settings.py' diff -Nru murano-dashboard-5.0.0~b2/functional_tests/collect_results.sh murano-dashboard-5.0.0/functional_tests/collect_results.sh --- murano-dashboard-5.0.0~b2/functional_tests/collect_results.sh 1970-01-01 00:00:00.000000000 +0000 +++ murano-dashboard-5.0.0/functional_tests/collect_results.sh 2018-02-28 11:28:21.000000000 +0000 @@ -0,0 +1,31 @@ +DEST=${DEST:-/opt/stack/new} +DASHBOARD_DIR=$DEST/murano-dashboard + +function create_artifacts_dir() { + dst="${WORKSPACE}/logs/artifacts" + mkdir -p "${dst}" +} + +function collect_screenshots() { + # Copy screenshots for failed tests + if [[ -d "$DASHBOARD_DIR/muranodashboard/tests/functional/screenshots/" ]]; then + mkdir -p "${WORKSPACE}/logs/artifacts/screenshots" + cp -Rv $DASHBOARD_DIR/muranodashboard/tests/functional/screenshots/* "${WORKSPACE}/logs/artifacts/screenshots/" + fi +} + +function generate_html_report() { + local xml_report="${WORKSPACE}/logs/test_report.xml" + local html_report="${WORKSPACE}/logs/test_report.html" + + if [[ -f "${WORKSPACE}/logs/test_report.xml" ]]; then + $(which python) "$DASHBOARD_DIR/functional_tests/generate_html_report.py" "${xml_report}" "${html_report}" + cp "${html_report}" "${WORKSPACE}/index.html" + fi +} + +function do_collect_results() { + create_artifacts_dir + collect_screenshots + generate_html_report +} diff -Nru murano-dashboard-5.0.0~b2/functional_tests/env_pkg_prepare.sh murano-dashboard-5.0.0/functional_tests/env_pkg_prepare.sh --- murano-dashboard-5.0.0~b2/functional_tests/env_pkg_prepare.sh 1970-01-01 00:00:00.000000000 +0000 +++ murano-dashboard-5.0.0/functional_tests/env_pkg_prepare.sh 2018-02-28 11:28:21.000000000 +0000 @@ -0,0 +1,24 @@ +function prepare_packages() { + + sudo wget https://sourceforge.net/projects/ubuntuzilla/files/mozilla/apt/pool/main/f/firefox-mozilla-build/firefox-mozilla-build_46.0.1-0ubuntu1_amd64.deb/download -O firefox46.deb + sudo dpkg -i firefox46.deb + sudo rm -f firefox46.deb + + sudo apt-get update + sudo apt-get install -y \ + libpq-dev \ + python-dev \ + libxml2-dev \ + libxslt1-dev \ + libffi-dev \ + make \ + gcc \ + ntpdate \ + xvfb \ + zip \ + python-openssl \ + python-crypto \ + libgtk-3-0 \ + libasound2 \ + libdbus-glib-1-2 +} diff -Nru murano-dashboard-5.0.0~b2/functional_tests/generate_html_report.py murano-dashboard-5.0.0/functional_tests/generate_html_report.py --- murano-dashboard-5.0.0~b2/functional_tests/generate_html_report.py 1970-01-01 00:00:00.000000000 +0000 +++ murano-dashboard-5.0.0/functional_tests/generate_html_report.py 2018-02-28 11:28:21.000000000 +0000 @@ -0,0 +1,164 @@ +#!/usr/bin/python +# Copyright (c) 2015 Mirantis, Inc. +# +# 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. +# + +from __future__ import with_statement +import jinja2 +import lxml.etree as et +import uuid +import sys +import os +import re + +if not __name__ == "__main__": + sys.exit(1) +if not len(sys.argv) >= 3: + sys.exit(1) +if not os.path.exists(sys.argv[1]): + sys.exit(1) + +LOG_LINE_PATTERN = "^(?P20[0-9]{2}\-[0-9]{2}\-[0-9]{2}) (?P