Make berrie script a bit more generic and add regular make check as well

git-svn-id: http://svn.osgeo.org/postgis/trunk@17612 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/ci/berrie/pg_init_start.sh b/ci/berrie/pg_init_start.sh
index 12053650d7444909f57ce5c9c6025c47f0777fd6..64566b60bef5e72c1e364d10443b5f45a261081c 100644 (file)
--- a/ci/berrie/pg_init_start.sh
+++ b/ci/berrie/pg_init_start.sh
@@ -1,18 +1,18 @@
 #Berrie is a 32-bit Rasberry Pi managed by Bruce Rindahl
 #This is script to launch custom compiled PostgreSQL
+#export label=berrie #this is passed in via Jenkins
 export WORKSPACE=/home/jenkins/workspace
 
-cd ${WORKSPACE}/PostGIS_Worker_Run/label/berrie/$BRANCH
+
+
 export OS_BUILD=32
 export PG_VER=12
-export PGPATH=${WORKSPACE}/pg/label/berrie/rel/pg${PG_VER}w${OS_BUILD}
+export PGPATH=${WORKSPACE}/pg/label/${label}/rel/pg${PG_VER}w${OS_BUILD}
 export PATH=${PATH}:${PGPATH}/bin:${PGPATH}/lib
 export PGPORT=55432
 export PGDATA=$PGPATH/data_${PGPORT}
 export PGLOG="$PGDATA/pgsql.log"
-# What to use to start up the postmaster (we do NOT use pg_ctl for this,
-# as it adds no value and can cause the postmaster to misrecognize a stale
-# lock file)
+# What to use to start up the postmaster
 DAEMON="$PGPATH/bin/pg_ctl -D $PGDATA -l logfile start"
 
 # What to use to shut down the postmaster
@@ -32,6 +32,7 @@ $PGPATH/bin/initdb
 
 echo -n "Starting PostgreSQL: "
 $DAEMON &
+#sleep a bit because sometimes postgres takes a bit to start up
 sleep 20
 echo "ok"
 exit 0
\ No newline at end of file

diff --git a/ci/berrie/postgis_regress.sh b/ci/berrie/postgis_regress.sh
index 1eb29bd950b752e48a4b0da50c36ac9c9388a123..47dfe8a77293de038d433a309e225ecbba2147f7 100644 (file)
--- a/ci/berrie/postgis_regress.sh
+++ b/ci/berrie/postgis_regress.sh
@@ -1,12 +1,15 @@
-#Berrie is a 32-bit Rasberry Pi managed by Bruce Rindahl
-#BRANCH is passed in via jenkins which is set via gitea web hook
+#bessie is a 32-bit Rasberry Pi managed by Bruce Rindahl
+## BRANCH is passed in via jenkins which is set via gitea web hook
 #export BRANCH=618a67b1d6fc223dd5a4c0b02c824939f21dbd65
+## label is set by jenkins
+#export label=${label}
+
 export WORKSPACE=/home/jenkins/workspace
 
-cd ${WORKSPACE}/PostGIS_Worker_Run/label/berrie/$BRANCH
+cd ${WORKSPACE}/PostGIS_Worker_Run/label/${label}/$BRANCH
 export OS_BUILD=32
 export PG_VER=12
-export PGPATH=${WORKSPACE}/pg/label/berrie/rel/pg${PG_VER}w${OS_BUILD}
+export PGPATH=${WORKSPACE}/pg/label/${label}/rel/pg${PG_VER}w${OS_BUILD}
 
 export PATH=${PATH}:${PGPATH}/bin:${PGPATH}/lib
 export PGPORT=55432
@@ -16,9 +19,9 @@ export PGHOST=localhost
 sh autogen.sh
 ./configure --with-pgconfig=${PGPATH}/bin/pg_config
 #make clean
-#make
+make
 
-#make check RUNTESTFLAGS="-v"
+make check RUNTESTFLAGS="-v"
 make install
 make check RUNTESTFLAGS="-v --extension"