commit b6c669982eceba8279c3ce3efb529609b277db03
author Alexander Evseev <aevseev@mirantis.com> Mon May 21 17:52:21 2018 +0300
committer Alexander Evseev <aevseev@mirantis.com> Mon May 21 18:00:51 2018 +0300
tree bbb468a19ddbca13daac005d8234393a37cd0b22
parent 85c95a16b6236975b98224aeb0a2482a709e31b6

Fix CodeNarc warning about empty catch (2nd try)

Change-Id: I2e6ca39173ad5bb44ab467aa57265b22f42114e1

validate-cloud.groovy

diff --git a/validate-cloud.groovy b/validate-cloud.groovy
index 5dd8008..dbfc94b 100644
--- a/validate-cloud.groovy
+++ b/validate-cloud.groovy
@@ -70,13 +70,7 @@
 
             stage('Run Rally tests') {
                 if (RUN_RALLY_TESTS.toBoolean() == true) {
-                    def report_dir = '/root/qa_results'
-                    try {
-                         if(REPORT_DIR != ""){
-                             report_dir = REPORT_DIR
-                         }
-                    } catch (MissingPropertyException e) {
-                    }
+                    def report_dir = env.REPORT_DIR ?: '/root/qa_results'
                     def rally_variables = ["floating_network=${FLOATING_NETWORK}",
                                            "rally_image=${RALLY_IMAGE}",
                                            "rally_flavor=${RALLY_FLAVOR}",