strip timestamped versions in feature installs

This is to satisfy CSIT tests that contains
a mix of SNAPSHOT and timestamped versions while
running tests

Change-Id: I1fe426dcca9250d0fe2c9c5264f1acb1ffbde57b
Issue-ID: POLICY-745
Signed-off-by: Jorge Hernandez <jh1730@att.com>

diff --git a/packages/docker/src/main/docker/docker-install.sh b/packages/docker/src/main/docker/docker-install.sh
index 5ec2582..4c647f1 100644 (file)
--- a/packages/docker/src/main/docker/docker-install.sh
+++ b/packages/docker/src/main/docker/docker-install.sh
@@ -839,7 +839,7 @@ function installFeatures
                SOURCE_DIR=$PWD
                for feature in feature-*.zip ; do
                        name="${feature#feature-}"
-                       name="${name%-[0-9]*\.zip}"
+                       name="${name%%-[0-9]*\.zip}"
                        mkdir -p "${FEATURES_HOME}/${name}" > /dev/null 2>&1
                        (cd "${FEATURES_HOME}/${name}"; jar xf ${SOURCE_DIR}/${feature})
                        featureConf="feature-${name}.conf"

diff --git a/policy-management/src/main/server-gen/bin/features b/policy-management/src/main/server-gen/bin/features
index b2e9bd5..9f139f8 100644 (file)
--- a/policy-management/src/main/server-gen/bin/features
+++ b/policy-management/src/main/server-gen/bin/features
@@ -921,7 +921,7 @@ function installFeatures
                                # the ZIP file is specified -- find the name
                                name="${feature##*/}"
                                name="${name#feature-}"
-                               name="${name%-[0-9]*\.zip}"
+                               name="${name%%-[0-9]*\.zip}"
 
                                # if the ZIP file has a directory name component,
                                # set 'dir' accordingly