Repository: EnMasseProject/enmasse
Pull request #3008 (2019-07-16 13:51:28)

suite improvements and fixes
Decreases the messages sent in `PlansTest#testMessagePersistenceAfterAutoScale` because of problems with timeouts in openshift 4 tests.
Fixes a bug in `GlobalConsoleTest#doTestSwitchAddressSpacePlan` that made `GlobalConsoleTest#doTestConnectToAddressSpaceConsole` fail 


Patch:
diff --git a/.jenkins/Jenkinsfile-pr b/.jenkins/Jenkinsfile-pr
index 985def409..e0fb630ca 100644
--- a/.jenkins/Jenkinsfile-pr
+++ b/.jenkins/Jenkinsfile-pr
@@ -83,9 +83,7 @@ pipeline {
         }
         stage('build') {
             when {
-                expression {
-                    env.TEST_ONLY == false
-                }
+                environment name: 'TEST_ONLY', value: 'false'
             }
             steps {
                 script {
@@ -96,9 +94,7 @@ pipeline {
         }
         stage('push docker images') {
             when {
-                expression {
-                    env.TEST_ONLY == false
-                }
+                environment name: 'TEST_ONLY', value: 'false'
             }
             steps {
                 sh 'oc login -u test -p test --server localhost:8443 --insecure-skip-tls-verify'
diff --git a/address-space-controller/pom.xml b/address-space-controller/pom.xml
index 728a575e2..706b4d360 100644
--- a/address-space-controller/pom.xml
+++ b/address-space-controller/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>address-space-controller</artifactId>
diff --git a/agent/pom.xml b/agent/pom.xml
index 47f1bef2c..bd682f92e 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.enmasse</groupId>
diff --git a/amqp-utils/pom.xml b/amqp-utils/pom.xml
index 3f1beba74..629053708 100644
--- a/amqp-utils/pom.xml
+++ b/amqp-utils/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>amqp-utils</artifactId>
diff --git a/api-common/pom.xml b/api-common/pom.xml
index 1ac0cb2f2..73da4e201 100644
--- a/api-common/pom.xml
+++ b/api-common/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>api-common</artifactId>
diff --git a/api-model/pom.xml b/api-model/pom.xml
index 1681d7626..aa485f2d5 100644
--- a/api-model/pom.xml
+++ b/api-model/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>api-model</artifactId>
diff --git a/api-server/pom.xml b/api-server/pom.xml
index f2e1e3b9c..76f05b204 100644
--- a/api-server/pom.xml
+++ b/api-server/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>api-server</artifactId>
diff --git a/broker-plugin/amqp-connector/pom.xml b/broker-plugin/amqp-connector/pom.xml
index 55b641cfb..d71cedd52 100644
--- a/broker-plugin/amqp-connector/pom.xml
+++ b/broker-plugin/amqp-connector/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>broker-plugin</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>amqp-connector</artifactId>
diff --git a/broker-plugin/jmx_exporter/pom.xml b/broker-plugin/jmx_exporter/pom.xml
index 28c1c5390..b21e59466 100644
--- a/broker-plugin/jmx_exporter/pom.xml
+++ b/broker-plugin/jmx_exporter/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>broker-plugin</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jmx_exporter</artifactId>
diff --git a/broker-plugin/plugin/pom.xml b/broker-plugin/plugin/pom.xml
index 9c30ee00d..630897ac1 100644
--- a/broker-plugin/plugin/pom.xml
+++ b/broker-plugin/plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>broker-plugin</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
diff --git a/broker-plugin/pom.xml b/broker-plugin/pom.xml
index 06a597be0..967d9cf7f 100644
--- a/broker-plugin/pom.xml
+++ b/broker-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
diff --git a/broker-plugin/sasl-delegation/pom.xml b/broker-plugin/sasl-delegation/pom.xml
index 2b875f57c..e148d6e24 100644
--- a/broker-plugin/sasl-delegation/pom.xml
+++ b/broker-plugin/sasl-delegation/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>broker-plugin</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>sasl-delegation</artifactId>
diff --git a/broker-plugin/tcnative/pom.xml b/broker-plugin/tcnative/pom.xml
index 3c6aed1a8..b1cff3f60 100644
--- a/broker-plugin/tcnative/pom.xml
+++ b/broker-plugin/tcnative/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>broker-plugin</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>tcnative</artifactId>
diff --git a/bundle/pom.xml b/bundle/pom.xml
index 4010c9b81..5e9dae7b5 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>enmasse</artifactId>
         <groupId>io.enmasse</groupId>
-        <version>0.29-SNAPSHOT</version>
+        <version>0.30-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
     <name>EnMasse Bundles</name>
diff --git a/console/console-httpd/pom.xml b/console/console-httpd/pom.xml
index 03e486b7f..5aea0d56e 100644
--- a/console/console-httpd/pom.xml
+++ b/console/console-httpd/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>console</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.enmasse</groupId>
diff --git a/console/console-init/pom.xml b/console/console-init/pom.xml
index 9e29f05bd..1ff09c928 100644
--- a/console/console-init/pom.xml
+++ b/console/console-init/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>console</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.enmasse</groupId>
diff --git a/console/pom.xml b/console/pom.xml
index caec457d5..3d7da2a59 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.enmasse</groupId>
diff --git a/controller-manager/pom.xml b/controller-manager/pom.xml
index 1fcfd2cc2..a4e0144f8 100644
--- a/controller-manager/pom.xml
+++ b/controller-manager/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
diff --git a/discovery-lib/pom.xml b/discovery-lib/pom.xml
index 3fda8e650..f474f71aa 100644
--- a/discovery-lib/pom.xml
+++ b/discovery-lib/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>discovery-lib</artifactId>
diff --git a/documentation/assemblies/assembly-installing.adoc b/documentation/assemblies/assembly-installing.adoc
index a1e379b8d..c4cbdede6 100644
--- a/documentation/assemblies/assembly-installing.adoc
+++ b/documentation/assemblies/assembly-installing.adoc
@@ -1,6 +1,7 @@
 // This assembly is included in the following assemblies:
 //
 // assembly-service-admin-guide.adoc
+
 [id='installing-{context}']
 = Installing {ProductName}
 
@@ -28,12 +29,12 @@ endif::[]
 ifeval::["{cmdcli}" == "oc"]
 
 ifdef::OperatorSource[]
-{ProductName} can be installed by applying the YAML files using the `oc` command-line tool, by using
-the Operator Marketplace, or by running the link:https://www.ansible.com/[Ansible^] playbooks.
+{ProductName} can be installed by applying the YAML files using the OpenShift Container Platform command-line interface, by using
+the Operator Marketplace, or by running the link:https://www.ansible.com/[Ansible^] playbook.
 endif::OperatorSource[]
 
 ifndef::OperatorSource[]
-{ProductName} can be installed by applying the YAML files using the `oc` command-line tool, or by running the link:https://www.ansible.com/[Ansible^] playbooks.
+{ProductName} can be installed by applying the YAML files using the OpenShift Container Platform command-line interface, or by running the link:https://www.ansible.com/[Ansible^] playbook.
 endif::OperatorSource[]
 
 include::../common/snip-prerequisites-openshift.adoc[]
diff --git a/documentation/assemblies/assembly-service-admin-guide.adoc b/documentation/assemblies/assembly-service-admin-guide.adoc
index dae3eda48..d7786256a 100644
--- a/documentation/assemblies/assembly-service-admin-guide.adoc
+++ b/documentation/assemblies/assembly-service-admin-guide.adoc
@@ -15,7 +15,7 @@ include::assembly-configuring.adoc[leveloffset=+1]
 
 include::assembly-upgrading.adoc[leveloffset=+1]
 
-include::../modules/proc-uninstalling.adoc[leveloffset=+1]
+include::assembly-uninstalling.adoc[leveloffset=+1]
 
 include::assembly-monitoring.adoc[leveloffset=+1]
 
diff --git a/documentation/assemblies/assembly-uninstalling.adoc b/documentation/assemblies/assembly-uninstalling.adoc
new file mode 100644
index 000000000..b3cb0d9d9
--- /dev/null
+++ b/documentation/assemblies/assembly-uninstalling.adoc
@@ -0,0 +1,15 @@
+// This assembly is included in the following assemblies:
+//
+// assembly-service-admin-guide.adoc
+// Installing master.adoc
+
+[id='assembly-uninstalling-{context}']
+= Uninstalling {ProductName}
+
+You must uninstall {ProductName} using the same method that you used to install {ProductName}.
+
+include::../modules/proc-uninstalling.adoc[leveloffset=+1]
+
+include::../modules/proc-uninstalling-using-ansible.adoc[leveloffset=+1]
+
+
diff --git a/documentation/modules/proc-installing-using-ansible.adoc b/documentation/modules/proc-installing-using-ansible.adoc
index 605c305ef..7cc9c664a 100644
--- a/documentation/modules/proc-installing-using-ansible.adoc
+++ b/documentation/modules/proc-installing-using-ansible.adoc
@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// assembly-installing-openshift.adoc
+// assembly-installing.adoc
 
 [id='installing-using-ansible-{context}']
 = Installing {ProductName} using Ansible
@@ -8,7 +8,7 @@
 Installing {ProductName} using Ansible requires creating an inventory file with the variables for
 configuring the system. Example inventory files can be found in the `ansible/inventory` folder.
 
-An example inventory file that enables a minimal installation of {ProductName}:
+The following example inventory file enables a minimal installation of {ProductName}:
 
 [source,options="nowrap"]
 ----
@@ -18,27 +18,27 @@ include::../service_admin/example.inventory[]
 The following Ansible configuration settings are supported:
 
 .Ansible configuration settings
-[cols="25%a,25%a,25%a,25%a",options="header"]
+[cols="35%a,40%a,15%a,10%a",options="header"]
 |===
 |Name |Description |Default value | Required
-|namespace|Specifies the namespace where {ProductName} is installed.|Not applicable |yes
-|enable_rbac|Specifies whether to enable RBAC authentication of REST APIs|True |no
-|service_catalog|Specifies whether to enable integration with the Service Catalog|False |no
+|namespace|Specifies the project where {ProductName} is installed. |Not applicable |yes
+|enable_rbac|Specifies whether to enable RBAC authentication of REST APIs |True |no
+|service_catalog|Specifies whether to enable integration with the Service Catalog |False |no
 |authentication_services|Specifies the list of authentication services to deploy. Supported values are `none` and `standard`. |`none` |no
 |keycloak_admin_password|Specifies the admin password to use for the `standard` authentication service {AuthProductName} instance |Not applicable |yes (if `standard` authentication service is enabled)
-|api_server|Specifies whether to enable the REST API server|True |no
-|register_api_server|Specifies whether to register the API server with {KubePlatform} master|False |no
-|secure_api_server|Specifies whether to enable mutual TLS for the API server|False |no
-|install_example_plans|Specifies whether to install example plans and infrastructure configurations|True|no
-|monitoring_namespace|Specifies the namespace where the {ProductName} monitoring is installed.|Not applicable |yes
-|monitoring_operator|Specifies whether to install the monitoring infrastructure|Not applicable|no
-|monitoring|Specifies whether to install the service monitors, Prometheus rules, and Grafana dashboards for monitoring {ProductName}|Not applicable|no
+|api_server|Specifies whether to enable the REST API server |True |no
+|register_api_server|Specifies whether to register the API server with {KubePlatform} master |False |no
+|secure_api_server|Specifies whether to enable mutual TLS for the API server |False |no
+|install_example_plans|Specifies whether to install example plans and infrastructure configurations |True |no
+|monitoring_namespace|Specifies the project where {ProductName} monitoring is installed. |Not applicable |yes
+|monitoring_operator|Specifies whether to install the monitoring infrastructure |Not applicable |no
+|monitoring|Specifies whether to install the service monitors, Prometheus rules, and Grafana dashboards for monitoring {ProductName} |Not applicable |no
 |===
 
 
 .Procedure
 
-. (Optional) Create an inventory file.
+. Create an inventory file.
 
 . Run the Ansible playbook:
 +
diff --git a/documentation/modules/proc-installing-using-bundle.adoc b/documentation/modules/proc-installing-using-bundle.adoc
index 5ec00315d..7544de976 100644
--- a/documentation/modules/proc-installing-using-bundle.adoc
+++ b/documentation/modules/proc-installing-using-bundle.adoc
@@ -19,11 +19,11 @@ ifeval::["{cmdcli}" == "oc"]
 {cmdcli} login -u system:admin
 ----
 
-. (Optional) If you want to deploy to a namespace other than `{ProductNamespace}` you must run the following command and substitute `{ProductNamespace}` in subsequent steps:
+. (Optional) If you want to deploy to a project other than `{ProductNamespace}` you must run the following command and substitute `{ProductNamespace}` in subsequent steps:
 +
 [options="nowrap",subs="+quotes,attributes"]
 ----
-sed -i 's/{ProductNamespace}/_my-namespace_/' install/bundles/{ProductBundleName}/*.yaml
+sed -i 's/{ProductNamespace}/_my-project_/' install/bundles/{ProductBundleName}/*.yaml
 ----
 
 . Create the project where you want to deploy {ProductName}:
diff --git a/documentation/modules/proc-uninstalling-using-ansible.adoc b/documentation/modules/proc-uninstalling-using-ansible.adoc
new file mode 100644
index 000000000..215e4ea16
--- /dev/null
+++ b/documentation/modules/proc-uninstalling-using-ansible.adoc
@@ -0,0 +1,21 @@
+// Module included in the following assemblies:
+//
+// assembly-uninstalling.adoc
+
+[id='proc-uninstalling-using-ansible-{context}']
+= Uninstalling {ProductName} using Ansible
+
+Uninstalling {ProductName} using Ansible requires using the same inventory file that was used for installing {ProductName}. 
+
+NOTE: The playbook deletes the `{ProductNamespace}` project.
+
+.Procedure
+
+. Run the Ansible playbook, where `_inventory-file_` specifies the inventory file used at installation:
++
+[options="nowrap",subs="+quotes,attributes"]
+----
+ansible-playbook -i _inventory-file_ ansible/playbooks/openshift/uninstall.yml
+----
+
+
diff --git a/documentation/modules/proc-uninstalling.adoc b/documentation/modules/proc-uninstalling.adoc
index e52fac220..df2e5c8c7 100644
--- a/documentation/modules/proc-uninstalling.adoc
+++ b/documentation/modules/proc-uninstalling.adoc
@@ -6,6 +6,8 @@
 [id='uninstalling-{context}']
 = Uninstalling {ProductName}
 
+This method uninstalls {ProductName} that was installed using the YAML bundle.
+
 .Procedure 
 
 ifeval::["{cmdcli}" == "oc"]
@@ -18,7 +20,7 @@ ifeval::["{cmdcli}" == "oc"]
 endif::[]
 
 ifeval::["{cmdcli}" == "oc"]
-. Delete "cluster level" resources:
+. Delete the cluster-level resources:
 +
 [options="nowrap",subs="attributes"]
 ----
@@ -38,7 +40,7 @@ ifeval::["{cmdcli}" == "oc"]
 endif::[]
 
 ifeval::["{cmdcli}" == "kubectl"]
-. Delete "cluster level" resources:
+. Delete the cluster-level resources:
 +
 [options="nowrap",subs="attributes"]
 ----
diff --git a/iot/iot-application-base/pom.xml b/iot/iot-application-base/pom.xml
index fc66d337c..5f0277030 100644
--- a/iot/iot-application-base/pom.xml
+++ b/iot/iot-application-base/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>iot</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
 
   <artifactId>iot-application-base</artifactId>
diff --git a/iot/iot-auth-service/pom.xml b/iot/iot-auth-service/pom.xml
index f05ff1ab0..531de748d 100644
--- a/iot/iot-auth-service/pom.xml
+++ b/iot/iot-auth-service/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>iot-application-base</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
     <relativePath>../iot-application-base</relativePath>
   </parent>
 
diff --git a/iot/iot-device-registry-file/pom.xml b/iot/iot-device-registry-file/pom.xml
index da7dfc87a..0c0037415 100644
--- a/iot/iot-device-registry-file/pom.xml
+++ b/iot/iot-device-registry-file/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>iot-application-base</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
     <relativePath>../iot-application-base</relativePath>
   </parent>
 
diff --git a/iot/iot-device-registry-infinispan/pom.xml b/iot/iot-device-registry-infinispan/pom.xml
index bd0e4fb12..b218b0208 100644
--- a/iot/iot-device-registry-infinispan/pom.xml
+++ b/iot/iot-device-registry-infinispan/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>iot-application-base</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
     <relativePath>../iot-application-base</relativePath>
   </parent>
 
diff --git a/iot/iot-gc/pom.xml b/iot/iot-gc/pom.xml
index 113faa205..af31a2d88 100644
--- a/iot/iot-gc/pom.xml
+++ b/iot/iot-gc/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>iot-application-base</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
     <relativePath>../iot-application-base</relativePath>
   </parent>
   <packaging>pom</packaging>
diff --git a/iot/iot-http-adapter/pom.xml b/iot/iot-http-adapter/pom.xml
index 66529d43c..5ad2938cf 100644
--- a/iot/iot-http-adapter/pom.xml
+++ b/iot/iot-http-adapter/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>iot-application-base</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
     <relativePath>../iot-application-base</relativePath>
   </parent>
 
diff --git a/iot/iot-mqtt-adapter/pom.xml b/iot/iot-mqtt-adapter/pom.xml
index 1125726ac..7a6f4bf19 100644
--- a/iot/iot-mqtt-adapter/pom.xml
+++ b/iot/iot-mqtt-adapter/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>iot-application-base</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
     <relativePath>../iot-application-base</relativePath>
   </parent>
 
diff --git a/iot/iot-proxy-configurator/pom.xml b/iot/iot-proxy-configurator/pom.xml
index d0f063439..3bfafc817 100644
--- a/iot/iot-proxy-configurator/pom.xml
+++ b/iot/iot-proxy-configurator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>iot-application-base</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
     <relativePath>../iot-application-base</relativePath>
   </parent>
   <packaging>pom</packaging>
diff --git a/iot/iot-tenant-service/pom.xml b/iot/iot-tenant-service/pom.xml
index b7bcd4bc3..d5de2f28e 100644
--- a/iot/iot-tenant-service/pom.xml
+++ b/iot/iot-tenant-service/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>iot-application-base</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
     <relativePath>../iot-application-base</relativePath>
   </parent>
 
diff --git a/iot/pom.xml b/iot/pom.xml
index 18bc193eb..ee82eae9b 100644
--- a/iot/pom.xml
+++ b/iot/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <artifactId>iot</artifactId>
   <packaging>pom</packaging>
diff --git a/k8s-api/pom.xml b/k8s-api/pom.xml
index 9f1e8b935..836518c4e 100644
--- a/k8s-api/pom.xml
+++ b/k8s-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.enmasse</groupId>
diff --git a/keycloak-plugin/pom.xml b/keycloak-plugin/pom.xml
index e9b95ac74..bc0731e50 100644
--- a/keycloak-plugin/pom.xml
+++ b/keycloak-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
diff --git a/keycloak-plugin/sasl-plugin/pom.xml b/keycloak-plugin/sasl-plugin/pom.xml
index 713147c71..4f7205e45 100644
--- a/keycloak-plugin/sasl-plugin/pom.xml
+++ b/keycloak-plugin/sasl-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>keycloak</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>sasl-plugin</artifactId>
diff --git a/keycloak-user-api/pom.xml b/keycloak-user-api/pom.xml
index 5c7b3c76b..4cac4a7b5 100644
--- a/keycloak-user-api/pom.xml
+++ b/keycloak-user-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.enmasse</groupId>
diff --git a/metrics-api/pom.xml b/metrics-api/pom.xml
index 8256fb578..c8c195cf3 100644
--- a/metrics-api/pom.xml
+++ b/metrics-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.enmasse</groupId>
diff --git a/mqtt-gateway/pom.xml b/mqtt-gateway/pom.xml
index bc36e0620..aab8154a0 100644
--- a/mqtt-gateway/pom.xml
+++ b/mqtt-gateway/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>mqtt-gateway</artifactId>
diff --git a/mqtt-lwt/pom.xml b/mqtt-lwt/pom.xml
index ac84fb79f..b9e778f34 100644
--- a/mqtt-lwt/pom.xml
+++ b/mqtt-lwt/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>mqtt-lwt</artifactId>
diff --git a/none-authservice/pom.xml b/none-authservice/pom.xml
index ae335f3c1..292340c50 100644
--- a/none-authservice/pom.xml
+++ b/none-authservice/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>none-authservice</artifactId>
diff --git a/pom.properties b/pom.properties
index 6fbade79c..2336844d7 100644
--- a/pom.properties
+++ b/pom.properties
@@ -2,6 +2,6 @@ application.display.name=EnMasse
 application.globalconsole.display.name=EnMasse Console
 application.bundle.prefix=enmasse
 license.advice.text=EnMasse comprises the following components:
-release.version=0.29-SNAPSHOT
-maven.version=0.29-SNAPSHOT
+release.version=0.30-SNAPSHOT
+maven.version=0.30-SNAPSHOT
 application.docs=https://enmasse.io/documentation/
diff --git a/pom.xml b/pom.xml
index 63598709e..48eb361e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
     <packaging>pom</packaging>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
 
     <name>EnMasse</name>
     <url>http://enmasse.io/</url>
diff --git a/service-broker/pom.xml b/service-broker/pom.xml
index 5c2f94494..6ad72cc73 100644
--- a/service-broker/pom.xml
+++ b/service-broker/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>service-broker</artifactId>
diff --git a/standard-controller/pom.xml b/standard-controller/pom.xml
index eedd58d1d..045c582ef 100644
--- a/standard-controller/pom.xml
+++ b/standard-controller/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>standard-controller</artifactId>
diff --git a/topic-forwarder/pom.xml b/topic-forwarder/pom.xml
index fec2f66b8..1ab8e2ae6 100644
--- a/topic-forwarder/pom.xml
+++ b/topic-forwarder/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>topic-forwarder</artifactId>


Test patch:
diff --git a/k8s-api-testutil/pom.xml b/k8s-api-testutil/pom.xml
index c5cbee8d6..4ec528106 100644
--- a/k8s-api-testutil/pom.xml
+++ b/k8s-api-testutil/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.29-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.enmasse</groupId>
diff --git a/systemtests/pom.xml b/systemtests/pom.xml
index 2396ceea6..5a403b7d0 100644
--- a/systemtests/pom.xml
+++ b/systemtests/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.enmasse</groupId>
         <artifactId>enmasse</artifactId>
-        <version>0.29-SNAPSHOT</version>
+        <version>0.30-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>systemtests</artifactId>
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/bases/web/GlobalConsoleTest.java b/systemtests/src/test/java/io/enmasse/systemtest/bases/web/GlobalConsoleTest.java
index a9655ec36..c748d7c72 100644
--- a/systemtests/src/test/java/io/enmasse/systemtest/bases/web/GlobalConsoleTest.java
+++ b/systemtests/src/test/java/io/enmasse/systemtest/bases/web/GlobalConsoleTest.java
@@ -22,7 +22,6 @@ import io.enmasse.systemtest.selenium.page.GlobalConsolePage;
 import io.enmasse.systemtest.utils.AddressSpaceUtils;
 import io.enmasse.systemtest.utils.AuthServiceUtils;
 import io.enmasse.systemtest.utils.TestUtils;
-import org.junit.jupiter.api.AfterEach;
 import org.slf4j.Logger;
 
 import java.util.Optional;
@@ -162,7 +161,7 @@ public abstract class GlobalConsoleTest extends TestBase {
                 .endAuthenticationService()
                 .endSpec()
                 .build();
-
+        addToAddressSpacess(addressSpace);
         globalConsolePage = new GlobalConsolePage(selenium, TestUtils.getGlobalConsoleRoute(), clusterUser);
         globalConsolePage.openGlobalConsolePage();
         globalConsolePage.createAddressSpace(addressSpace);
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/common/plans/PlansTest.java b/systemtests/src/test/java/io/enmasse/systemtest/common/plans/PlansTest.java
index b986936aa..0ac3f7bd0 100644
--- a/systemtests/src/test/java/io/enmasse/systemtest/common/plans/PlansTest.java
+++ b/systemtests/src/test/java/io/enmasse/systemtest/common/plans/PlansTest.java
@@ -748,14 +748,14 @@ class PlansTest extends TestBase {
             log.info("Address {} => {}", q.getMetadata().getName(), a.getStatus().getBrokerStatuses());
         });
 
-        //send 1000 messages to each queue
+        //send 500 messages to each queue
         UserCredentials user = new UserCredentials("test-scale-user-name", "test_scale_user_pswd");
         createOrUpdateUser(messagePersistAddressSpace, user);
 
         AmqpClient queueClient = amqpClientFactory.createQueueClient(messagePersistAddressSpace);
         queueClient.getConnectOptions().setCredentials(user);
 
-        List<String> msgs = TestUtils.generateMessages(1000);
+        List<String> msgs = TestUtils.generateMessages(500);
         Future<Integer> sendResult1 = queueClient.sendMessages(queue1.getSpec().getAddress(), msgs);
         Future<Integer> sendResult2 = queueClient.sendMessages(queue2.getSpec().getAddress(), msgs);
         Future<Integer> sendResult3 = queueClient.sendMessages(queue3.getSpec().getAddress(), msgs);