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>

4 files changed, 15 insertions, 10 deletions

diff --git a/blueprints/pgaas-cluster.yaml-template b/blueprints/pgaas-cluster.yaml-template
index a1885f1..2883e38 100644
--- a/blueprints/pgaas-cluster.yaml-template
+++ b/blueprints/pgaas-cluster.yaml-template
@@ -104,8 +104,8 @@ inputs:
       fi
 
       echo Look in /tmp/pgaas.out for output from installing PGaaS
-      NEXUS={{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform }}/debs
-      for pkg in cdf_17.10.0-LATEST.deb pgaas_17.10.0-LATEST.deb
+      NEXUS={{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_storage_pgaas_debs_releases }}/debs
+      for pkg in cdf.deb-1.0.0 pgaas.deb-1.0.0
       do
           OUT=/tmp/$pkg
           curl -s -k -f -o $OUT $NEXUS/$pkg
diff --git a/blueprints/pgaas.yaml-template b/blueprints/pgaas.yaml-template
index 5dbf932..cfa29fc 100644
--- a/blueprints/pgaas.yaml-template
+++ b/blueprints/pgaas.yaml-template
@@ -97,8 +97,8 @@ inputs:
       fi
 
       echo Look in /tmp/pgaas.out for output from installing PGaaS
-      NEXUS={{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform }}/debs
-      for pkg in cdf_17.10.0-LATEST.deb pgaas_17.10.0-LATEST.deb
+      NEXUS={{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_storage_pgaas_debs_releases }}/debs
+      for pkg in cdf.deb-1.0.0 pgaas.deb-1.0.0
       do
           OUT=/tmp/$pkg
           curl -s -k -f -o $OUT $NEXUS/$pkg
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: /'
 }
 
 
diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh
index 3da3e01..afbe961 100755
--- a/mvn-phase-script.sh
+++ b/mvn-phase-script.sh
@@ -83,7 +83,8 @@ echo "MVN_RAWREPO_SERVERID is            [$MVN_RAWREPO_SERVERID]"
 echo "MVN_DOCKERREGISTRY_SNAPSHOT is     [$MVN_DOCKERREGISTRY_SNAPSHOT]"
 echo "MVN_DOCKERREGISTRY_RELEASE is      [$MVN_DOCKERREGISTRY_RELEASE]"
 echo "MVN_DOCKERREGISTRY_PUBLIC is       [$MVN_DOCKERREGISTRY_PUBLIC]"
-
+echo "HOME is                            [$HOME]"
+echo "PROJECT_ROOT is                    [$PROJECT_ROOT]"
 
 source "${PROJECT_ROOT}"/mvn-phase-lib.sh