aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony L Hansen <tony@att.com>2017-02-27 21:02:51 +0000
committerTony L Hansen <tony@att.com>2017-02-27 21:02:51 +0000
commit95fffb34520abfb54f6ed7b1c010188f5bc70238 (patch)
tree9f230bfe44bae14ea541d6ce77a9ba0264decb07
parent62907cbd1fca59634716a92cffa90488b9f2ce28 (diff)
modify verify to not upload debian files
Change-Id: I42c9400f486eba73abe5572d5eef1b3c08b7302a Signed-off-by: Tony L Hansen <tony@att.com>
-rw-r--r--cdf/src/makefile4
-rw-r--r--pgaas-post/src/makefile4
-rw-r--r--pgaas/src/makefile4
-rw-r--r--postgresql-config/src/makefile4
-rw-r--r--postgresql-prep/src/makefile4
-rwxr-xr-xscript-pgaas-deb-build.sh30
6 files changed, 36 insertions, 14 deletions
diff --git a/cdf/src/makefile b/cdf/src/makefile
index 2c67454..e0b33a6 100644
--- a/cdf/src/makefile
+++ b/cdf/src/makefile
@@ -37,6 +37,10 @@ stage: build clean-stage clean-common
cp -p repackage.* $(INS)
+debian-verify: stage
+ repackage -b debian $(REPACKAGEDEBIANOPTS) -d $(INS)
+ @echo debian verify built
+
debian: stage
repackage -b debian $(REPACKAGEDEBIANOPTS) -d $(INS) -u
repackage -b debian $(REPACKAGEDEBIANOPTS) -d $(INS) -u -B LATEST
diff --git a/pgaas-post/src/makefile b/pgaas-post/src/makefile
index d66d74b..b376979 100644
--- a/pgaas-post/src/makefile
+++ b/pgaas-post/src/makefile
@@ -28,6 +28,10 @@ stage: clean-stage clean-common
cp -p repackage.* $(INS)
+debian-verify: stage
+ repackage -b debian $(REPACKAGEDEBIANOPTS) -d $(INS)
+ @echo debian verify built
+
debian: stage
repackage -y repackage.json -b debian -d $(INS) -u
repackage -y repackage.json -b debian -d $(INS) -u -B LATEST
diff --git a/pgaas/src/makefile b/pgaas/src/makefile
index 73fe4eb..eb144b5 100644
--- a/pgaas/src/makefile
+++ b/pgaas/src/makefile
@@ -31,6 +31,10 @@ stage: clean-stage
cp -p repackage.* $(INS)
+debian-verify: stage
+ repackage -b debian $(REPACKAGEDEBIANOPTS) -d $(INS)
+ @echo debian verify built
+
debian: stage
repackage -b debian $(REPACKAGEDEBIANOPTS) -d $(INS) -u
repackage -b debian $(REPACKAGEDEBIANOPTS) -d $(INS) -u -B LATEST
diff --git a/postgresql-config/src/makefile b/postgresql-config/src/makefile
index bf6ae6b..be34e90 100644
--- a/postgresql-config/src/makefile
+++ b/postgresql-config/src/makefile
@@ -29,6 +29,10 @@ stage: clean-stage clean-common
cp -p repackage.* $(INS)
+debian-verify: stage
+ repackage -b debian $(REPACKAGEDEBIANOPTS) -d $(INS)
+ @echo debian verify built
+
debian: stage
repackage -y repackage.json -b debian -d $(INS) -u
repackage -y repackage.json -b debian -d $(INS) -u -B LATEST
diff --git a/postgresql-prep/src/makefile b/postgresql-prep/src/makefile
index 1266aa6..94db121 100644
--- a/postgresql-prep/src/makefile
+++ b/postgresql-prep/src/makefile
@@ -33,6 +33,10 @@ stage: clean-stage clean-common testlock/testlock
cp -p repackage.* $(INS)
+debian-verify: stage
+ repackage -b debian $(REPACKAGEDEBIANOPTS) -d $(INS)
+ @echo debian verify built
+
debian: stage
repackage -y repackage.json -b debian -d $(INS) -u
repackage -y repackage.json -b debian -d $(INS) -u -B LATEST
diff --git a/script-pgaas-deb-build.sh b/script-pgaas-deb-build.sh
index 3869117..3c10a3a 100755
--- a/script-pgaas-deb-build.sh
+++ b/script-pgaas-deb-build.sh
@@ -1,19 +1,17 @@
#!/bin/bash
# Create a debian package and push to remote repo
-if [ "$#" != "1" ]; then
- phase="verify"
-else
- phase="$1"
- case $phase in
- verify|merge|release)
- echo "Running $phase job"
- ;;
- *)
- echo "Unknown phase $phase"
- exit 1
- esac
-fi
+[ "$#" != "1" ] && set -- verify
+phase="$1"
+case $phase in
+ verify|merge|release)
+ echo "Running $phase job"
+ ;;
+ *)
+ echo "Unknown phase $phase"
+ exit 1
+ ;;
+esac
#
@@ -41,7 +39,11 @@ 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'"
-make debian
+case "$phase" in
+ verify ) make debian-verify ;;
+ merge ) make debian ;;
+ release ) make debian ;;
+esac
echo "================= ENDING SCRIPT TO CREATE DEBIAN FILES ================="