From 7fef5d5a8b6b9d8d85e2d03a24b1b04e25d5306c Mon Sep 17 00:00:00 2001
From: Javier Pena <jpena@redhat.com>
Date: Wed, 21 Apr 2021 18:41:07 +0200
Subject: [PATCH] Update some packages to wallaby versions

This commit updates the version for:

- kuryr-tempest-plugin
- monasca-statsd
- murano-dashboard
- tempest

Change-Id: Idaddae85ce7f683d55ec5e3f9eef0c34e4334d1c
---
 .../kuryr-tempest-plugin/kuryr-tempest-plugin.spec.j2     | 2 +-
 openstack/monasca-statsd/monasca-statsd.spec.j2           | 2 +-
 openstack/murano-dashboard/murano-dashboard.spec.j2       | 2 +-
 openstack/tempest/tempest.spec.j2                         | 8 +++++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/openstack/kuryr-tempest-plugin/kuryr-tempest-plugin.spec.j2 b/openstack/kuryr-tempest-plugin/kuryr-tempest-plugin.spec.j2
index ad271c9d2..78854bcee 100644
--- a/openstack/kuryr-tempest-plugin/kuryr-tempest-plugin.spec.j2
+++ b/openstack/kuryr-tempest-plugin/kuryr-tempest-plugin.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'kuryr-tempest-plugin' %}
-{% set upstream_version = upstream_version('0.7.0') %}
+{% set upstream_version = upstream_version('0.9.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/monasca-statsd/monasca-statsd.spec.j2 b/openstack/monasca-statsd/monasca-statsd.spec.j2
index 66f3aba14..5ac765240 100644
--- a/openstack/monasca-statsd/monasca-statsd.spec.j2
+++ b/openstack/monasca-statsd/monasca-statsd.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'monasca-statsd' %}
-{% set upstream_version = upstream_version('2.1.0') %}
+{% set upstream_version = upstream_version('2.2.0') %}
 {% set rpm_release = '1' %}
 
 Name:           {{ py2name() }}
diff --git a/openstack/murano-dashboard/murano-dashboard.spec.j2 b/openstack/murano-dashboard/murano-dashboard.spec.j2
index 5bd316b6a..2428760d2 100644
--- a/openstack/murano-dashboard/murano-dashboard.spec.j2
+++ b/openstack/murano-dashboard/murano-dashboard.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'murano-dashboard' %}
-{% set upstream_version = upstream_version('10.0.0') %}
+{% set upstream_version = upstream_version('11.0.0') %}
 {% set rpm_release = '1' %}
 
 %global sname {{ pypi_name }}
diff --git a/openstack/tempest/tempest.spec.j2 b/openstack/tempest/tempest.spec.j2
index a13e2a162..ddca372ad 100644
--- a/openstack/tempest/tempest.spec.j2
+++ b/openstack/tempest/tempest.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'tempest' %}
-{% set upstream_version = upstream_version('25.0.1') %}
+{% set upstream_version = upstream_version('27.0.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
@@ -114,7 +114,8 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 install -d -m 755 %{buildroot}%{_sysconfdir}/tempest
 mv %{buildroot}/%{_prefix}/%{_sysconfdir}/{{ pypi_name }}/accounts.yaml.sample %{buildroot}/%{_sysconfdir}/{{ pypi_name }}/accounts.yaml
 mv %{buildroot}/%{_prefix}/%{_sysconfdir}/{{ pypi_name }}/logging.conf.sample %{buildroot}/%{_sysconfdir}/{{ pypi_name }}/logging.conf
-mv %{buildroot}/%{_prefix}/%{_sysconfdir}/{{ pypi_name }}/whitelist.yaml %{buildroot}/%{_sysconfdir}/{{ pypi_name }}/whitelist.yaml
+mv %{buildroot}/%{_prefix}/%{_sysconfdir}/{{ pypi_name }}/rbac-persona-accounts.yaml.sample %{buildroot}/%{_sysconfdir}/{{ pypi_name }}/rbac-persona-accounts.yaml
+mv %{buildroot}/%{_prefix}/%{_sysconfdir}/{{ pypi_name }}/allow-list.yaml %{buildroot}/%{_sysconfdir}/{{ pypi_name }}/allow-list.yaml
 
 # install config
 PYTHONPATH=. oslo-config-generator --config-file %{_builddir}/{{ pypi_name }}-{{ upstream_version }}/tempest/cmd/config-generator.tempest.conf --output-file %{buildroot}%{_sysconfdir}/tempest/tempest.conf
@@ -144,7 +145,8 @@ cp -av .stestr.conf %{buildroot}/%{_localstatedir}/lib/%{name}-test/
 %config(noreplace) %{_sysconfdir}/tempest/tempest.conf
 %config(noreplace) %{_sysconfdir}/tempest/logging.conf
 %config(noreplace) %{_sysconfdir}/tempest/accounts.yaml
-%config(noreplace) %{_sysconfdir}/tempest/whitelist.yaml
+%config(noreplace) %{_sysconfdir}/tempest/allow-list.yaml
+%config(noreplace) %{_sysconfdir}/tempest/rbac-persona-accounts.yaml
 %if 0%{?suse_version}
 %{_localstatedir}/lib/openstack-tempest-test
 %endif