[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc1-23-g6772f6c8c
git at osgeo.org
git at osgeo.org
Sat Aug 13 13:02:15 PDT 2022
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, master has been updated
via 6772f6c8c7ac7de6121f88896da106e275ab10b3 (commit)
via 550d6d53a720e17ccacea8094161e6aae02d220b (commit)
via edfe99324156e793e34b87bcc1571c79d187b21c (commit)
via 21ce33e9fe69a94521e57b8af1f22012fa7aa1af (commit)
via d88bc56490e7cc4fb308cd78a4bfb00d531d5549 (commit)
via 3af00701502d98a904099e24bcf8d5ad6727507c (commit)
via 7575a07b0a6a7e5554d2fcfdf3bef1e9733b47ce (commit)
via 69c45e803df0a405f2a2964c70cea8bc9faaf3e2 (commit)
via d67f59b9551a514b5da655122726d735fb91bf0a (commit)
via 6edce9174969b4acbb6195ab2784d27d2b36e17c (commit)
via 54ad8ac7128fc0cf2e58f95e6ee503a314efa274 (commit)
via ee803093f1c9053edcb9c9dae5f77342c09e4776 (commit)
from 0a627466b1d414949488e22dcfe69b569cc533a7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6772f6c8c7ac7de6121f88896da106e275ab10b3
Merge: 0a627466b 550d6d53a
Author: Regina Obe <lr at pcorp.us>
Date: Sat Aug 13 15:44:45 2022 -0400
Merge branch 'test-pipeline'
commit 550d6d53a720e17ccacea8094161e6aae02d220b
Author: Regina Obe <lr at pcorp.us>
Date: Sat Aug 13 15:21:13 2022 -0400
Mark the shell scripts as executable
diff --git a/ci/debbie-pipeline/postgis_build.sh b/ci/debbie-pipeline/postgis_build.sh
old mode 100644
new mode 100755
diff --git a/ci/debbie-pipeline/postgis_regress.sh b/ci/debbie-pipeline/postgis_regress.sh
old mode 100644
new mode 100755
commit edfe99324156e793e34b87bcc1571c79d187b21c
Author: Regina Obe <lr at pcorp.us>
Date: Sat Aug 13 15:18:46 2022 -0400
Try to run shell scripts
diff --git a/Jenkinsfile b/Jenkinsfile
index ddd05d7af..4cf28ada4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,22 +8,12 @@ pipeline {
stages {
stage('Build') {
steps {
- export PG_VER=15
- export PGPATH=/usr/lib/postgresql/${PG_VER}
- export PATH=${PGPATH}/bin:${PATH}
- sh autogen.sh
- ./configure
- make
+ sh './ci/debbie-pipeline/postgis_build.sh'
}
}
stage('Test') {
steps {
- make check
- }
- }
- stage('Deploy') {
- steps {
- echo 'Deploying....'
+ sh './ci/debbie-pipeline/postgis_regress.sh'
}
}
}
diff --git a/ci/debbie-pipeline/postgis_build.sh b/ci/debbie-pipeline/postgis_build.sh
new file mode 100644
index 000000000..89284f5ed
--- /dev/null
+++ b/ci/debbie-pipeline/postgis_build.sh
@@ -0,0 +1,6 @@
+export PG_VER=15
+export PGPATH=/usr/lib/postgresql/${PG_VER}
+export PATH=${PGPATH}/bin:${PATH}
+sh autogen.sh
+./configure
+make
diff --git a/ci/debbie-pipeline/postgis_regress.sh b/ci/debbie-pipeline/postgis_regress.sh
new file mode 100644
index 000000000..65725aefc
--- /dev/null
+++ b/ci/debbie-pipeline/postgis_regress.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+set -e
+## begin variables passed in by jenkins
+
+export PG_VER=15
+export PGPATH=/usr/lib/postgresql/${PG_VER}
+export PATH=${PGPATH}/bin:${PATH}
+export MAKE_GARDEN=0
+export MAKE_EXTENSION=1
+export DUMP_RESTORE=0
+export MAKE_LOGBT=0
+export NO_SFCGAL=0
+export MAKE_UPGRADE=1
+
+
+make check
+
+## install so we can test upgrades/dump-restores etc.
+sudo make install
+
+if [ "$MAKE_EXTENSION" = "1" ]; then
+ echo "Running extension testing"
+ make check RUNTESTFLAGS="$RUNTESTFLAGS --extension"
+ if [ "$?" != "0" ]; then
+ exit $?
+ fi
+fi
+
+
+
+if [ "$DUMP_RESTORE" = "1" ]; then
+ echo "Dum restore test"
+ make check RUNTESTFLAGS="$RUNTESTFLAGS --dumprestore"
+ if [ "$?" != "0" ]; then
+ exit $?
+ fi
+fi
+
+if [ "$MAKE_GARDEN" = "1" ]; then
+ echo "Running garden test"
+ make garden
+ if [ "$?" != "0" ]; then
+ exit $?
+ fi
+fi
+
+# Test all available upgrades
+# TODO: protect via some variable ?
+if [ "$MAKE_UPGRADE" = "1" ]; then
+ utils/check_all_upgrades.sh \
+ `grep '^POSTGIS_' Version.config | cut -d= -f2 | paste -sd '.'`
+ if [ "$?" != "0" ]; then
+ exit $?
+ fi
+fi
commit 21ce33e9fe69a94521e57b8af1f22012fa7aa1af
Author: Regina Obe <lr at pcorp.us>
Date: Sat Aug 13 15:07:41 2022 -0400
Start adding real steps
diff --git a/Jenkinsfile b/Jenkinsfile
index 816eb9878..ddd05d7af 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,12 +8,17 @@ pipeline {
stages {
stage('Build') {
steps {
- echo 'Building..'
+ export PG_VER=15
+ export PGPATH=/usr/lib/postgresql/${PG_VER}
+ export PATH=${PGPATH}/bin:${PATH}
+ sh autogen.sh
+ ./configure
+ make
}
}
stage('Test') {
steps {
- echo 'Testing..'
+ make check
}
}
stage('Deploy') {
commit d88bc56490e7cc4fb308cd78a4bfb00d531d5549
Author: Regina Obe <lr at pcorp.us>
Date: Sat Aug 13 14:35:26 2022 -0400
Change to jarmmie
diff --git a/Jenkinsfile b/Jenkinsfile
index f7f560b0b..816eb9878 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
pipeline {
agent {
label {
- label 'armmie'
+ label 'jarmmie-drone'
}
}
commit 3af00701502d98a904099e24bcf8d5ad6727507c
Author: Regina Obe <lr at pcorp.us>
Date: Sat Aug 13 13:57:53 2022 -0400
Try with different node
diff --git a/Jenkinsfile b/Jenkinsfile
index 1ff744839..f7f560b0b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
pipeline {
agent {
label {
- label 'docker'
+ label 'armmie'
}
}
commit 7575a07b0a6a7e5554d2fcfdf3bef1e9733b47ce
Author: Regina Obe <lr at pcorp.us>
Date: Sat Aug 13 13:42:43 2022 -0400
Try again - just node name
diff --git a/Jenkinsfile b/Jenkinsfile
index 40adddb21..1ff744839 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,9 +1,7 @@
pipeline {
agent {
label {
- image 'docker.osgeo.org/postgis/build-test:trisquel2'
label 'docker'
- registryUrl 'https://docker.osgeo.org/'
}
}
commit 69c45e803df0a405f2a2964c70cea8bc9faaf3e2
Author: Regina Obe <lr at pcorp.us>
Date: Sat Aug 13 13:38:52 2022 -0400
Try again
diff --git a/Jenkinsfile b/Jenkinsfile
index 234b476d7..40adddb21 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,6 @@
pipeline {
agent {
- docker {
+ label {
image 'docker.osgeo.org/postgis/build-test:trisquel2'
label 'docker'
registryUrl 'https://docker.osgeo.org/'
commit d67f59b9551a514b5da655122726d735fb91bf0a
Author: Regina Obe <lr at pcorp.us>
Date: Sat Aug 13 13:37:39 2022 -0400
Test with a specific agent
diff --git a/Jenkinsfile b/Jenkinsfile
index 1c4586175..234b476d7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,11 @@
pipeline {
- agent {jarmmie}
+ agent {
+ docker {
+ image 'docker.osgeo.org/postgis/build-test:trisquel2'
+ label 'docker'
+ registryUrl 'https://docker.osgeo.org/'
+ }
+ }
stages {
stage('Build') {
commit 6edce9174969b4acbb6195ab2784d27d2b36e17c
Author: Regina Obe <lr at pcorp.us>
Date: Sat Aug 13 13:12:44 2022 -0400
Fix typo
diff --git a/Jenkinsfile b/Jenkinsfile
index c47e3b2ef..1c4586175 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,5 @@
pipeline {
- agent jarmmie
+ agent {jarmmie}
stages {
stage('Build') {
commit 54ad8ac7128fc0cf2e58f95e6ee503a314efa274
Author: Regina Obe <lr at pcorp.us>
Date: Sat Aug 13 13:09:59 2022 -0400
Try designating a specific agent
diff --git a/Jenkinsfile b/Jenkinsfile
index b9822500b..c47e3b2ef 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,5 @@
pipeline {
- agent any
+ agent jarmmie
stages {
stage('Build') {
commit ee803093f1c9053edcb9c9dae5f77342c09e4776
Author: Regina Obe <lr at pcorp.us>
Date: Sat Aug 13 12:21:42 2022 -0400
Testing pipleine mode
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000000000..b9822500b
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,21 @@
+pipeline {
+ agent any
+
+ stages {
+ stage('Build') {
+ steps {
+ echo 'Building..'
+ }
+ }
+ stage('Test') {
+ steps {
+ echo 'Testing..'
+ }
+ }
+ stage('Deploy') {
+ steps {
+ echo 'Deploying....'
+ }
+ }
+ }
+}
-----------------------------------------------------------------------
Summary of changes:
Jenkinsfile | 20 +++++++++++++
ci/debbie-pipeline/postgis_build.sh | 6 ++++
ci/debbie-pipeline/postgis_regress.sh | 55 +++++++++++++++++++++++++++++++++++
3 files changed, 81 insertions(+)
create mode 100644 Jenkinsfile
create mode 100755 ci/debbie-pipeline/postgis_build.sh
create mode 100755 ci/debbie-pipeline/postgis_regress.sh
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list