diff --git a/compute/compute-node.Dockerfile b/compute/compute-node.Dockerfile index f4a5593b71..3459983a34 100644 --- a/compute/compute-node.Dockerfile +++ b/compute/compute-node.Dockerfile @@ -1847,7 +1847,7 @@ COPY docker-compose/ext-src/ /ext-src/ COPY --from=pg-build /postgres /postgres #COPY --from=postgis-src /ext-src/ /ext-src/ COPY --from=plv8-src /ext-src/ /ext-src/ -#COPY --from=h3-pg-src /ext-src/ /ext-src/ +COPY --from=h3-pg-src /ext-src/h3-pg-src /ext-src/h3-pg-src COPY --from=postgresql-unit-src /ext-src/ /ext-src/ COPY --from=pgvector-src /ext-src/ /ext-src/ COPY --from=pgjwt-src /ext-src/ /ext-src/ diff --git a/docker-compose/ext-src/h3-pg-src/neon-test.sh b/docker-compose/ext-src/h3-pg-src/neon-test.sh new file mode 100755 index 0000000000..e2ab22f03e --- /dev/null +++ b/docker-compose/ext-src/h3-pg-src/neon-test.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +set -ex +cd "$(dirname "${0}")" +PG_REGRESS=$(dirname "$(pg_config --pgxs)")/../test/regress/pg_regress +dropdb --if-exists contrib_regression +createdb contrib_regression +cd h3_postgis/test +psql -d contrib_regression -c "CREATE EXTENSION postgis" -c "CREATE EXTENSION postgis_raster" -c "CREATE EXTENSION h3" -c "CREATE EXTENSION h3_postgis" +TESTS=$(echo sql/* | sed 's|sql/||g; s|\.sql||g') +${PG_REGRESS} --use-existing --dbname contrib_regression ${TESTS} +cd ../../h3/test +TESTS=$(echo sql/* | sed 's|sql/||g; s|\.sql||g') +dropdb --if-exists contrib_regression +createdb contrib_regression +psql -d contrib_regression -c "CREATE EXTENSION h3" +${PG_REGRESS} --use-existing --dbname contrib_regression ${TESTS} diff --git a/docker-compose/ext-src/h3-pg-src/test-upgrade.sh b/docker-compose/ext-src/h3-pg-src/test-upgrade.sh new file mode 100755 index 0000000000..72d7040966 --- /dev/null +++ b/docker-compose/ext-src/h3-pg-src/test-upgrade.sh @@ -0,0 +1,7 @@ +#!/bin/sh +set -ex +cd "$(dirname ${0})" +PG_REGRESS=$(dirname "$(pg_config --pgxs)")/../test/regress/pg_regress +cd h3/test +TESTS=$(echo sql/* | sed 's|sql/||g; s|\.sql||g') +${PG_REGRESS} --use-existing --inputdir=./ --bindir='/usr/local/pgsql/bin' --dbname=contrib_regression ${TESTS} \ No newline at end of file diff --git a/docker-compose/test_extensions_upgrade.sh b/docker-compose/test_extensions_upgrade.sh index 51d1e40802..f1cf17f531 100755 --- a/docker-compose/test_extensions_upgrade.sh +++ b/docker-compose/test_extensions_upgrade.sh @@ -82,7 +82,8 @@ EXTENSIONS='[ {"extname": "pg_ivm", "extdir": "pg_ivm-src"}, {"extname": "pgjwt", "extdir": "pgjwt-src"}, {"extname": "pgtap", "extdir": "pgtap-src"}, -{"extname": "pg_repack", "extdir": "pg_repack-src"} +{"extname": "pg_repack", "extdir": "pg_repack-src"}, +{"extname": "h3", "extdir": "h3-pg-src"} ]' EXTNAMES=$(echo ${EXTENSIONS} | jq -r '.[].extname' | paste -sd ' ' -) COMPUTE_TAG=${NEW_COMPUTE_TAG} docker compose --profile test-extensions up --quiet-pull --build -d