Mark bug 6595 on test failure

[integration/test.git] / tools / clustering / cluster-deployer / deploy.py

diff --git a/tools/clustering/cluster-deployer/deploy.py b/tools/clustering/cluster-deployer/deploy.py
index 6de9feabe00314038ef27471344d8553de379a93..cd8962de175a92191326ae1b37f152d7735122da 100755 (executable)
--- a/tools/clustering/cluster-deployer/deploy.py
+++ b/tools/clustering/cluster-deployer/deploy.py
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/env python
 #
 # This script deploys a cluster
 # -------------------------------------------
@@ -148,6 +148,8 @@ class Deployer:
         distribution_name \
             = os.path.splitext(os.path.basename(self.distribution))[0]
         distribution_ver = re.search('(\d+\.\d+\.\d+-\w+\Z)|'
+                                     '(\d+\.\d+\.\d+-\w+)(-RC\d+\Z)|'
+                                     '(\d+\.\d+\.\d+-\w+)(-RC\d+(\.\d+)\Z)|'
                                      '(\d+\.\d+\.\d+-\w+)(-SR\d+\Z)|'
                                      '(\d+\.\d+\.\d+-\w+)(-SR\d+(\.\d+)\Z)',
                                      distribution_name)  # noqa
@@ -157,7 +159,7 @@ class Deployer:
                                       " (Must contain version in the form: " \
                                       "\"<#>.<#>.<#>-<name>\" or \"<#>.<#>." \
                                       "<#>-<name>-SR<#>\" or \"<#>.<#>.<#>" \
-                                      "-<name>\", e.g. 0.2.0-SNAPSHOT)"  # noqa
+                                      "-<name>-RC<#>\", e.g. 0.2.0-SNAPSHOT)"
             sys.exit(1)
         distribution_ver = distribution_ver.group()