From: Lorand Jakab <lojakab@cisco.com>
Date: Thu, 18 Aug 2016 21:19:35 +0000 (-0500)
Subject: Allow deploying RC distributions
X-Git-Tag: release/boron~85
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=1071049adb870557ba6de994b1f37a3652d3c675

Allow deploying RC distributions

Change-Id: Ib8e6c63aa6962c11875301667caf909fa5c2897a
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
---

diff --git a/tools/clustering/cluster-deployer/deploy.py b/tools/clustering/cluster-deployer/deploy.py
index 877d7d946b..cd8962de17 100755
--- a/tools/clustering/cluster-deployer/deploy.py
+++ b/tools/clustering/cluster-deployer/deploy.py
@@ -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()