From e9066d55319b4b8a23f8334c336a2813a96566aa Mon Sep 17 00:00:00 2001 From: Sven Klemm Date: Thu, 27 May 2021 20:07:56 +0200 Subject: [PATCH] Remove PG11 from CI Remove all CI runs against postgres 11 --- .github/workflows/apt-packages.yaml | 2 +- .github/workflows/cron-tests.yaml | 20 ++------------ .../workflows/linux-32bit-build-and-test.yaml | 4 +-- .github/workflows/rpm-packages.yaml | 2 +- .github/workflows/update-test.yaml | 4 +-- .github/workflows/windows-build-and-test.yaml | 4 +-- .travis.yml | 24 ----------------- scripts/docker-build.sh | 2 +- scripts/docker-run-tests.sh | 2 +- scripts/docker_postgres_snapshot/Dockerfile | 2 +- scripts/gh_matrix_builder.py | 23 +++------------- scripts/test_update_from_tag.sh | 2 +- scripts/test_updates_pg11.sh | 26 ------------------- test/runner.sh | 4 +-- test/runner_shared.sh | 2 +- 15 files changed, 17 insertions(+), 106 deletions(-) delete mode 100755 scripts/test_updates_pg11.sh diff --git a/.github/workflows/apt-packages.yaml b/.github/workflows/apt-packages.yaml index 148891f5e..88ceab950 100644 --- a/.github/workflows/apt-packages.yaml +++ b/.github/workflows/apt-packages.yaml @@ -22,7 +22,7 @@ jobs: # Debian images: 9 (stretch), or 10 (buster) # Ubuntu images: 18.04 LTS (bionic), 19.10 (eoan), 20.04 LTS (focal) image: [ "debian:9-slim", "debian:10-slim", "ubuntu:bionic", "ubuntu:focal"] - pg: [ 11, 12, 13 ] + pg: [ 12, 13 ] steps: - name: Add repositories diff --git a/.github/workflows/cron-tests.yaml b/.github/workflows/cron-tests.yaml index ea87237b1..84582401d 100644 --- a/.github/workflows/cron-tests.yaml +++ b/.github/workflows/cron-tests.yaml @@ -13,10 +13,8 @@ jobs: strategy: fail-fast: false matrix: - pg: [11, 12, 13] + pg: [12, 13] include: - - pg: 11 - pg_minor_compile: 0 - pg: 12 pg_minor_compile: 0 - pg: 13 @@ -33,20 +31,6 @@ jobs: run: | ./scripts/docker-run-abi-test.sh - sanitizer: - name: ASAN and UBSAN - runs-on: ubuntu-latest - strategy: - fail-fast: false - - steps: - - name: Checkout TimescaleDB - uses: actions/checkout@v2 - - - name: Sanitizer - run: | - ./scripts/test_sanitizers.sh - memory_leak: name: Memory leak on insert runs-on: ubuntu-latest @@ -69,7 +53,7 @@ jobs: strategy: fail-fast: false matrix: - pg: [11, 12, 13] + pg: [12, 13] env: PG_MAJOR: ${{ matrix.pg }} PG_VERSION: ${{ matrix.pg }} diff --git a/.github/workflows/linux-32bit-build-and-test.yaml b/.github/workflows/linux-32bit-build-and-test.yaml index 4c96dcaac..8ea884fe9 100644 --- a/.github/workflows/linux-32bit-build-and-test.yaml +++ b/.github/workflows/linux-32bit-build-and-test.yaml @@ -19,11 +19,9 @@ jobs: strategy: fail-fast: false matrix: - pg: [ "11", "12", "13" ] + pg: [ "12", "13" ] build_type: [ Debug ] include: - - pg: 11 - ignores: append-11 chunk_adaptive-11 continuous_aggs_bgw_drop_chunks remote_txn transparent_decompression-11 continuous_aggs_insert continuous_aggs_multi continuous_aggs_concurrent_refresh plan_skip_scan-11 - pg: 12 ignores: append-12 chunk_adaptive-12 continuous_aggs_bgw_drop_chunks remote_txn transparent_decompression-12 plan_skip_scan-12 - pg: 13 diff --git a/.github/workflows/rpm-packages.yaml b/.github/workflows/rpm-packages.yaml index aef1353d5..d828f3859 100644 --- a/.github/workflows/rpm-packages.yaml +++ b/.github/workflows/rpm-packages.yaml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: image: [ "centos:centos7", "centos:centos8" ] - pg: [ 11, 12, 13 ] + pg: [ 12, 13 ] steps: - name: Add repositories diff --git a/.github/workflows/update-test.yaml b/.github/workflows/update-test.yaml index d75f559b8..17f63b890 100644 --- a/.github/workflows/update-test.yaml +++ b/.github/workflows/update-test.yaml @@ -13,10 +13,8 @@ jobs: runs-on: 'ubuntu-latest' strategy: matrix: - pg: ["11.12","12.7","13.3"] + pg: ["12.7","13.3"] include: - - pg: 11.12 - pg_major: 11 - pg: 12.7 pg_major: 12 - pg: 13.3 diff --git a/.github/workflows/windows-build-and-test.yaml b/.github/workflows/windows-build-and-test.yaml index a8cab1f22..2a2f202d9 100644 --- a/.github/workflows/windows-build-and-test.yaml +++ b/.github/workflows/windows-build-and-test.yaml @@ -12,12 +12,10 @@ jobs: strategy: fail-fast: false matrix: - pg: [ 11, 12, 13 ] + pg: [ 12, 13 ] os: [ windows-2019 ] build_type: [ Debug, Release ] include: - - pg: 11 - pkg_version: 11.12.1 - pg: 12 pkg_version: 12.7.1 - pg: 13 diff --git a/.travis.yml b/.travis.yml index 7d7be54bd..7613a305a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,30 +25,6 @@ jobs: include: # This runs tests on ARM32 emulation - - if: branch = arm_test - stage: test - name: "Regression 11.0 ARM processors" - env: - - PG_VERSION=11.0 - - RETRY_PREFIX="" - before_install: - - docker run --rm --privileged multiarch/qemu-user-static:register --reset - - docker run -d --name docker_arm_emulator -v ${TRAVIS_BUILD_DIR}:/timescaledb timescaledev/timescaledb-arm32:pg${PG_VERSION} /bin/sleep infinity - - docker exec docker_arm_emulator /bin/bash -c "chown -R postgres:postgres /timescaledb" - install: - - docker exec docker_arm_emulator /bin/bash -c "mkdir /build && chown postgres:postgres /build" - - docker exec -u postgres docker_arm_emulator /bin/bash -c "cd /build && CFLAGS='-Werror -O2' cmake /timescaledb -DCMAKE_BUILD_TYPE=Debug && make" - - docker exec docker_arm_emulator /bin/bash -c "cd /build && make install" - before_script: - after_failure: - - docker exec -u postgres -it docker_arm_emulator find /build -name regression.diffs -exec cat {} + - - docker exec -u postgres -it docker_arm_emulator find /build -name postmaster.log -exec cat {} + - script: - # allow 50 mins to run - - travis_wait 50 docker exec -u postgres docker_arm_emulator /bin/bash -c "cd /build && make installcheck IGNORES='multi_transaction_indexing bgw_db_scheduler continuous_aggs_insert continuous_aggs_bgw plan_ordered_append-11 parallel-11 compression_ddl continuous_aggs_insert continuous_aggs_multi'" - after_script: - - docker rm -f docker_arm_emulator - - if: branch = arm_test stage: test name: "Regression 12.0 ARM processors" diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh index 3105d73af..bcb30b51e 100755 --- a/scripts/docker-build.sh +++ b/scripts/docker-build.sh @@ -5,7 +5,7 @@ # SCRIPT_DIR=$(dirname $0) BASE_DIR=${PWD}/${SCRIPT_DIR}/.. -PG_VERSION=${PG_VERSION:-11.5} +PG_VERSION=${PG_VERSION:-12.0} PG_IMAGE_TAG=${PG_IMAGE_TAG:-${PG_VERSION}-alpine} BUILD_CONTAINER_NAME=${BUILD_CONTAINER_NAME:-pgbuild} BUILD_IMAGE_NAME=${BUILD_IMAGE_NAME:-$USER/pgbuild} diff --git a/scripts/docker-run-tests.sh b/scripts/docker-run-tests.sh index a1d50df89..d4c81d7ea 100755 --- a/scripts/docker-run-tests.sh +++ b/scripts/docker-run-tests.sh @@ -5,7 +5,7 @@ # SCRIPT_DIR=$(dirname $0) BASE_DIR=${PWD}/${SCRIPT_DIR}/.. -PG_IMAGE_TAG=${PG_IMAGE_TAG:-11.0-alpine} +PG_IMAGE_TAG=${PG_IMAGE_TAG:-12.0-alpine} CONTAINER_NAME=${CONTAINER_NAME:-pgtest} case $1 in diff --git a/scripts/docker_postgres_snapshot/Dockerfile b/scripts/docker_postgres_snapshot/Dockerfile index e02626e3e..40ec4bbd4 100644 --- a/scripts/docker_postgres_snapshot/Dockerfile +++ b/scripts/docker_postgres_snapshot/Dockerfile @@ -1,5 +1,5 @@ # vim:set ft=dockerfile: -ARG major_version=11 +ARG major_version=12 ARG minor_version=0 FROM postgres:$major_version.$minor_version-alpine diff --git a/scripts/gh_matrix_builder.py b/scripts/gh_matrix_builder.py index ee078defb..20db26694 100644 --- a/scripts/gh_matrix_builder.py +++ b/scripts/gh_matrix_builder.py @@ -20,8 +20,6 @@ import sys # github event type which is either push, pull_request or schedule event_type = sys.argv[1] -PG11_EARLIEST = "11.0" -PG11_LATEST = "11.12" PG12_EARLIEST = "12.0" PG12_LATEST = "12.7" PG13_EARLIEST = "13.2" @@ -106,8 +104,7 @@ def macos_config(overrides): base_config.update(overrides) return base_config -# always test debug build on latest pg 11, 12, 13 -m["include"].append(build_debug_config({"pg":PG11_LATEST})) +# always test debug build on latest of all supported pg versions m["include"].append(build_debug_config({"pg":PG12_LATEST})) m["include"].append(build_debug_config({"pg":PG13_LATEST})) @@ -118,18 +115,6 @@ m["include"].append(build_release_config(macos_config({}))) # entries to the matrix if event_type != "pull_request": - # add debug test for first supported PG11 version - # there is a problem when building PG 11.0 on ubuntu - # with llvm-9 so we use llvm-8 instead - pg11_debug_earliest = { - "pg": PG11_EARLIEST, - "llvm_config": "/usr/bin/llvm-config-8", - "clang": "clang-8", - "extra_packages": "clang-8 llvm-8 llvm-8-dev llvm-8-tools", - "installcheck_args": "IGNORES='cluster-11 continuous_aggs_insert continuous_aggs_multi continuous_aggs_concurrent_refresh'" - } - m["include"].append(build_debug_config(pg11_debug_earliest)) - # add debug test for first supported PG12 version pg12_debug_earliest = { "pg": PG12_EARLIEST, @@ -143,13 +128,11 @@ if event_type != "pull_request": # add debug test for MacOS m["include"].append(build_debug_config(macos_config({}))) - # add release test for latest pg 11, 12 and 13 - m["include"].append(build_release_config({"pg":PG11_LATEST})) + # add release test for latest pg 12 and 13 m["include"].append(build_release_config({"pg":PG12_LATEST})) m["include"].append(build_release_config({"pg":PG13_LATEST})) - # add apache only test for latest pg 11, 12 and 13 - m["include"].append(build_apache_config({"pg":PG11_LATEST})) + # add apache only test for latest pg 12 and 13 m["include"].append(build_apache_config({"pg":PG12_LATEST})) m["include"].append(build_apache_config({"pg":PG13_LATEST})) diff --git a/scripts/test_update_from_tag.sh b/scripts/test_update_from_tag.sh index 423d80c5e..2736f5b1e 100755 --- a/scripts/test_update_from_tag.sh +++ b/scripts/test_update_from_tag.sh @@ -10,7 +10,7 @@ TEST_VERSION=${TEST_VERSION:-v2} TEST_TMPDIR=${TEST_TMPDIR:-$(mktemp -d 2>/dev/null || mktemp -d -t 'timescaledb_update_test' || mkdir -p /tmp/${RANDOM})} UPDATE_PG_PORT=${UPDATE_PG_PORT:-6432} CLEAN_PG_PORT=${CLEAN_PG_PORT:-6433} -PG_VERSION=${PG_VERSION:-11.0} +PG_VERSION=${PG_VERSION:-12.0} GIT_ID=$(git -C ${BASE_DIR} describe --dirty --always | sed -e "s|/|_|g") UPDATE_FROM_IMAGE=${UPDATE_FROM_IMAGE:-timescale/timescaledb} UPDATE_FROM_TAG=${UPDATE_FROM_TAG:-0.1.0} diff --git a/scripts/test_updates_pg11.sh b/scripts/test_updates_pg11.sh deleted file mode 100755 index e0c81facd..000000000 --- a/scripts/test_updates_pg11.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -e - -SCRIPT_DIR=$(dirname $0) - -source ${SCRIPT_DIR}/test_functions.inc - -# There are repair steps between: -# 1.7.1 and 1.7.2 -# 2.0.0-rc1 and 2.0.0-rc2 -# -# Please extend this list if repairs are needed between more steps. -run_tests "$@" -r -v2 \ - 1.1.0-pg11 1.1.1-pg11 1.2.0-pg11 1.2.1-pg11 1.2.2-pg11 -run_tests "$@" -r -v4 \ - 1.3.0-pg11 1.3.1-pg11 1.3.2-pg11 1.4.0-pg11 1.4.1-pg11 1.4.2-pg11 -run_tests "$@" -r -v5 \ - 1.5.0-pg11 1.5.1-pg11 1.6.0-pg11 1.6.1-pg11 -run_tests "$@" -r -v6 \ - 1.7.0-pg11 1.7.1-pg11 1.7.2-pg11 1.7.3-pg11 1.7.4-pg11 1.7.5-pg11 -run_tests "$@" -r -v7 \ - 2.0.0-rc1-pg11 -run_tests "$@" -v7 \ - 2.0.0-rc2-pg11 2.0.0-rc3-pg11 2.0.0-rc4-pg11 2.0.0-pg11 2.0.1-pg11 2.0.2-pg11 2.1.0-pg11 \ - 2.1.1-pg11 2.2.0-pg11 2.2.1-pg11 2.3.0-pg11 diff --git a/test/runner.sh b/test/runner.sh index 627c99b0e..1ce0a0051 100755 --- a/test/runner.sh +++ b/test/runner.sh @@ -16,8 +16,8 @@ TEST_SUPPORT_FILE=${CURRENT_DIR}/sql/utils/testsupport.sql # to get the name of the test CURRENT_TEST=${PGAPPNAME##pg_regress/} -# Since PG11 and PG12 tests do not run in parallel, we remove the -# trailing "-11" (or "-12") suffix to get a good symbol that can be +# Since different PG version tests cannot run in parallel in the same instance, +# we remove the trailing version suffix to get a good symbol that can be # used as identifier as well. TEST_DBNAME="db_${CURRENT_TEST%%-[0-9][0-9]}" diff --git a/test/runner_shared.sh b/test/runner_shared.sh index a69f9a576..84a10d8b1 100755 --- a/test/runner_shared.sh +++ b/test/runner_shared.sh @@ -16,7 +16,7 @@ read -r VERSION < ${CURRENT_DIR}/../version.config EXT_VERSION=${VERSION##version = } # PGAPPNAME will be 'pg_regress/test' so we cut off the prefix -# to get the name of the test (PG 10 and 11 only) +# to get the name of the test TEST_BASE_NAME=${PGAPPNAME##pg_regress/} # if this is a versioned test our name will have version as suffix