summaryrefslogtreecommitdiffstats
path: root/mvn-phase-lib.sh
diff options
context:
space:
mode:
authorTony Hansen <tony@att.com>2017-10-24 19:35:57 +0000
committerTony Hansen <tony@att.com>2017-10-24 20:07:58 +0000
commitffa416db73f1dbc03eed66fb606eaa7113cd1561 (patch)
tree55f578d393236a61be8dedc66d0bb06b3821fc00 /mvn-phase-lib.sh
parent963956dd4f6a3049ae323216514f8fd575df3e72 (diff)
fix refs to ccsdk.storage.pgaas in blueprints
the files were moved and the variable needs to expand properly fix path for check-blueprint-vs-input Change-Id: Iacb0e4255300b3d9543d5e7dd88b0bca4ceddc61 Signed-off-by: Tony Hansen <tony@att.com> Issue-ID: CCSDK-128 Signed-off-by: Tony Hansen <tony@att.com>
Diffstat (limited to 'mvn-phase-lib.sh')
-rwxr-xr-xmvn-phase-lib.sh14
1 files changed, 9 insertions, 5 deletions
diff --git a/mvn-phase-lib.sh b/mvn-phase-lib.sh
index 6cef83e..d855abc 100755
--- a/mvn-phase-lib.sh
+++ b/mvn-phase-lib.sh
@@ -108,7 +108,9 @@ expand_templates()
export ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.ccsdk.platform.plugins"
export ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_blueprints_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.ccsdk.platform.blueprints"
export ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_blueprints_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.ccsdk.platform.blueprints"
-
+ export ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_storage_pgaas_debs_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.ccsdk.storage.pgaas/snapshots"
+ export ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_storage_pgaas_debs_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.ccsdk.storage.pgaas/releases"
+
export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2/releases"
export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2/snapshots"
export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.plugins/releases"
@@ -171,8 +173,9 @@ expand_templates()
echo "====> Resolving the following template from environment variables "
echo "$TEMPLATES"
for KEY in $TEMPLATES; do
- VALUE1=$(eval 'echo "$"'"$KEY"'"' | sed 1q)
+ VALUE1=$(eval 'echo "$'"$KEY"'"' | sed 1q)
VALUE2=$(eval 'echo "$'"$KEY"'"' | sed -e 's/\//\\\//g' -e 's/$/\\/' -e '$s/\\$//')
+ if [ -z "$VALUE2" ];then echo "WARNING WARNING WARNING: $KEY found with no expansion"; fi
echo "======> Resolving template $KEY to value $VALUE1 for file $F2"
sed -i "s/{{[[:space:]]*$KEY[[:space:]]*}}/$VALUE2/g" "$F2"
@@ -203,12 +206,13 @@ test_templates()
done
echo Verify that the inputs are correct
- PATH=$PATH:$PWD/check-blueprint-vs-input/bin
+ PATH=$PATH:$PROJECT_ROOT/check-blueprint-vs-input/bin
find . -name '*-template' | sed -e 's/-template$//' |
while read blueprint
do
- check-blueprint-vs-input -b $blueprint -i check-blueprint-vs-input/lib/sample-inputs.yaml || true
- done
+ check-blueprint-vs-input -b $blueprint -i $PROJECT_ROOT/check-blueprint-vs-input/lib/sample-inputs.yaml || true
+ done |
+ sed -e 's/^/WARNING WARNING WARNING: /'
}