From d1b2b1841eb269717e3e5262913eff8e41df9320 Mon Sep 17 00:00:00 2001
From: Tony L Hansen <tony@att.com>
Date: Fri, 3 Mar 2017 20:43:49 +0000
Subject: further mods to deployment script, makefiles

Change-Id: Ie6442975732392894b95cc244cd91e3db4b56a17
Signed-off-by: Tony L Hansen <tony@att.com>
---
 cdf/src/makefile               |  2 +-
 pgaas-post/src/makefile        |  2 +-
 pgaas/src/makefile             |  2 +-
 postgresql-config/src/makefile |  2 +-
 postgresql-prep/src/makefile   |  2 +-
 script-pgaas-deb-build.sh      | 17 ++++++++---------
 version.properties             |  6 ++++++
 7 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 version.properties

diff --git a/cdf/src/makefile b/cdf/src/makefile
index e0b33a6..4687dcd 100644
--- a/cdf/src/makefile
+++ b/cdf/src/makefile
@@ -43,7 +43,7 @@ debian-verify: stage
 
 debian: stage
 	repackage -b debian $(REPACKAGEDEBIANOPTS) -d $(INS) -u
-	repackage -b debian $(REPACKAGEDEBIANOPTS) -d $(INS) -u -B LATEST
+	# repackage -b debian $(REPACKAGEDEBIANOPTS) -d $(INS) -u -B LATEST
 	@echo debian built
 
 
diff --git a/pgaas-post/src/makefile b/pgaas-post/src/makefile
index b376979..07c260d 100644
--- a/pgaas-post/src/makefile
+++ b/pgaas-post/src/makefile
@@ -34,7 +34,7 @@ debian-verify: stage
 
 debian: stage
 	repackage -y repackage.json -b debian -d $(INS) -u
-	repackage -y repackage.json -b debian -d $(INS) -u -B LATEST
+	# repackage -y repackage.json -b debian -d $(INS) -u -B LATEST
 	@echo debian built
 
 upload-javadocs: 
diff --git a/pgaas/src/makefile b/pgaas/src/makefile
index eb144b5..e76189a 100644
--- a/pgaas/src/makefile
+++ b/pgaas/src/makefile
@@ -37,7 +37,7 @@ debian-verify: stage
 
 debian: stage
 	repackage -b debian $(REPACKAGEDEBIANOPTS) -d $(INS) -u
-	repackage -b debian $(REPACKAGEDEBIANOPTS) -d $(INS) -u -B LATEST
+	# repackage -b debian $(REPACKAGEDEBIANOPTS) -d $(INS) -u -B LATEST
 	@echo debian built
 
 upload-javadocs: 
diff --git a/postgresql-config/src/makefile b/postgresql-config/src/makefile
index be34e90..aeaea2b 100644
--- a/postgresql-config/src/makefile
+++ b/postgresql-config/src/makefile
@@ -35,7 +35,7 @@ debian-verify: stage
 
 debian: stage
 	repackage -y repackage.json -b debian -d $(INS) -u
-	repackage -y repackage.json -b debian -d $(INS) -u -B LATEST
+	# repackage -y repackage.json -b debian -d $(INS) -u -B LATEST
 	@echo debian built
 
 upload-javadocs: 
diff --git a/postgresql-prep/src/makefile b/postgresql-prep/src/makefile
index 94db121..9999fa6 100644
--- a/postgresql-prep/src/makefile
+++ b/postgresql-prep/src/makefile
@@ -39,7 +39,7 @@ debian-verify: stage
 
 debian: stage
 	repackage -y repackage.json -b debian -d $(INS) -u
-	repackage -y repackage.json -b debian -d $(INS) -u -B LATEST
+	# repackage -y repackage.json -b debian -d $(INS) -u -B LATEST
 	@echo debian built
 
 upload-javadocs: 
diff --git a/script-pgaas-deb-build.sh b/script-pgaas-deb-build.sh
index 3c10a3a..f628ccd 100755
--- a/script-pgaas-deb-build.sh
+++ b/script-pgaas-deb-build.sh
@@ -30,15 +30,14 @@ PASS=$(xpath -q -e \
 export NETRC=$(mktemp)
 echo "machine nexus.openecomp.org login ${USER} password ${PASS}" > "${NETRC}"
 
-if [ "$phase" == "verify" ]; then
-    REPO="${NEXUS_RAW}/org.openecomp.dcae.pgaas/deb-snapshots"
-else
-    REPO="${NEXUS_RAW}/org.openecomp.dcae.devnull/deb-snapshots"
-fi
-export REPACKAGEDEBIANUPLOAD="set -x; curl -k --netrc-file '${NETRC}' \
-    --upload-file '{0}' '${REPO}/{2}/{1}'"
-export REPACKAGEDEBIANUPLOAD2="set -x; curl -k --netrc-file '${NETRC}' \
-    --upload-file '{0}' '${REPO}/{2}/{4}-LATEST.deb'"
+REPO="${NEXUS_RAW}/org.openecomp.dcae.pgaas/deb-snapshots"
+
+export REPACKAGEDEBIANUPLOAD="set -x; echo curl -k --netrc-file '${NETRC}' \
+    --upload-file '{0}' '${REPO}/{2}-{1}'"
+export REPACKAGEDEBIANUPLOAD3="set -x; echo curl -k --netrc-file '${NETRC}' \
+    --upload-file '{0}' '${REPO}/{2}-{4}-SNAPSHOT.deb'"
+export REPACKAGEDEBIANUPLOAD2="set -x; echo curl -k --netrc-file '${NETRC}' \
+    --upload-file '{0}' '${REPO}/{2}-{4}-LATEST.deb'"
 case "$phase" in
 	verify ) make debian-verify ;;
 	merge ) make debian ;;
diff --git a/version.properties b/version.properties
new file mode 100644
index 0000000..2ddebb3
--- /dev/null
+++ b/version.properties
@@ -0,0 +1,6 @@
+major=1
+minor=0
+patch=0
+base_version=${major}.${minor}.${patch}
+release_version=${base_version}
+snapshot_version=${base_version}-SNAPSHOT
-- 
cgit 1.2.3-korg