diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-03-31 13:57:50 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-03-31 13:57:50 -0400 |
| commit | 32d7d9ee6e7ce8f2ee63b700133b679466976c3d (patch) | |
| tree | 2e2cad3234c7e6db581bee2c7793ae650f58cac6 /jjb | |
| parent | 9d7290af5591ca634681845c50d079f095a6e03b (diff) | |
Apex: Fixes regexp to match label names as well
Change-Id: I42f8836320e4bce2f890aa4a17d59f53efab7f97
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/apex/apex-deploy.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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" |