Allow deploying RC distributions 30/44330/2
authorLorand Jakab <lojakab@cisco.com>
Thu, 18 Aug 2016 21:19:35 +0000 (16:19 -0500)
committerJamo Luhrsen <jluhrsen@redhat.com>
Fri, 19 Aug 2016 20:32:58 +0000 (20:32 +0000)
Change-Id: Ib8e6c63aa6962c11875301667caf909fa5c2897a
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
tools/clustering/cluster-deployer/deploy.py

index 877d7d9..cd8962d 100755 (executable)
@@ -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()
 

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.