From 32d7d9ee6e7ce8f2ee63b700133b679466976c3d Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Fri, 31 Mar 2017 13:57:50 -0400
Subject: Apex: Fixes regexp to match label names as well

Change-Id: I42f8836320e4bce2f890aa4a17d59f53efab7f97
Signed-off-by: Tim Rozet <trozet@redhat.com>
---
 jjb/apex/apex-deploy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'jjb')

diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index 6343b838b..c7ca3f5e3 100755
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -123,7 +123,7 @@ if [[ "$BUILD_DIRECTORY" == *verify* || "$BUILD_DIRECTORY" == *promote* ]]; then
 # use RPMs
 else
     # find version of RPM
-    VERSION_EXTENSION=$(echo $(basename $RPM_LIST) | grep -Eo '[0-9]+\.[0-9]+-[0-9]{8}')
+    VERSION_EXTENSION=$(echo $(basename $RPM_LIST) | grep -Eo '[0-9]+\.[0-9]+-([0-9]{8}|[a-z]+-[0-9]\.[0-9]+)')
     # build RPM List which already includes base Apex RPM
     for pkg in ${APEX_PKGS}; do
         RPM_LIST+=" ${RPM_INSTALL_PATH}/opnfv-apex-${pkg}-${VERSION_EXTENSION}.noarch.rpm"
-- 
cgit 1.2.3-korg