From c98baab6b56967e222b825e22e5808e17c02d025 Mon Sep 17 00:00:00 2001 From: David Steele Date: Thu, 19 May 2022 18:24:09 -0400 Subject: [PATCH] New CI container builds for PostgreSQL 15 beta1 and minor releases. Remove VM_OS_REPO since it is no longer required. Rebalance PostgreSQL versions for more efficient test times. Always print version of PostgreSQL when testing. This helps verify that new minor releases are being used. --- test/container.yaml | 11 ++++------ .../pgBackRestTest/Common/ContainerTest.pm | 21 +++++-------------- test/lib/pgBackRestTest/Common/VmTest.pm | 13 ++++-------- .../lib/pgBackRestTest/Env/Host/HostDbTest.pm | 6 +++++- 4 files changed, 18 insertions(+), 33 deletions(-) diff --git a/test/container.yaml b/test/container.yaml index 846a69d54..4c570f2ea 100644 --- a/test/container.yaml +++ b/test/container.yaml @@ -12,15 +12,12 @@ # - docker login -u pgbackrest # - VM=XXX;DATE=YYYYMMDDX;BASE=pgbackrest/test:${VM?}-base;docker tag ${BASE?} ${BASE?}-${DATE?} && docker push ${BASE?}-${DATE?} # ********************************************************************************************************************************** -20220512A: +20220519A: x86_64: - u18: ab7da2bc87492aa0231b5014f05166cdeb9a3d30 - -20220504A: - x86_64: - u20: 45b0905785dfd06c867b4067563171970c7581c5 + u18: 36f27a31ed9af97fcbfaba09794c719c225f885d + u20: 17c74ed3fd3d76119f672740d77caf873fc57bac + rh7: 31d4a6c10534e69bc0251e11d86ee9b00971d823 20210902A: x86_64: - rh7: c4d02428812374ab6a22efa437499592ae9c5f08 f33: 04b3353c5fcc859c9df528e2fa78e6ed73c6390b diff --git a/test/lib/pgBackRestTest/Common/ContainerTest.pm b/test/lib/pgBackRestTest/Common/ContainerTest.pm index cacbf4573..0a1019582 100755 --- a/test/lib/pgBackRestTest/Common/ContainerTest.pm +++ b/test/lib/pgBackRestTest/Common/ContainerTest.pm @@ -396,12 +396,7 @@ sub containerBuild " libdbd-pg-perl libhtml-parser-perl libssl-dev libperl-dev \\\n" . " libyaml-libyaml-perl tzdata devscripts lintian libxml-checker-perl txt2man debhelper \\\n" . " libppi-html-perl libtemplate-perl libtest-differences-perl zlib1g-dev libxml2-dev pkg-config \\\n" . - " libbz2-dev bzip2 libyaml-dev libjson-pp-perl liblz4-dev liblz4-tool gnupg"; - - if ($strOS eq VM_U20) - { - $strScript .= " lsb-release"; - } + " libbz2-dev bzip2 libyaml-dev libjson-pp-perl liblz4-dev liblz4-tool gnupg lsb-release"; # This package is required to build valgrind on 32-bit if ($oVm->{$strOS}{&VM_ARCH} eq VM_ARCH_I386) @@ -502,15 +497,11 @@ sub containerBuild else { $strScript .= - " echo 'deb http://apt.postgresql.org/pub/repos/apt/ " . - $$oVm{$strOS}{&VM_OS_REPO} . '-pgdg main' . "' >> /etc/apt/sources.list.d/pgdg.list && \\\n" . - ($strOS eq VM_U20 ? - " echo \"deb http://apt.postgresql.org/pub/repos/apt/ \$(lsb_release -s -c)-pgdg-testing main 15\"" . - " >> /etc/apt/sources.list.d/pgdg.list && \\\n" : '') . + " echo \"deb http://apt.postgresql.org/pub/repos/apt/ \$(lsb_release -s -c)-pgdg main" . + ($strOS eq VM_U20 ? ' 15' : '') . "\" >> /etc/apt/sources.list.d/pgdg.list && \\\n" . " wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \\\n" . " apt-get update && \\\n" . - " apt-get install -y --no-install-recommends" . - ($strOS eq VM_U20 ? " -t \$(lsb_release -s -c)-pgdg-testing" : '') . " postgresql-common libpq-dev && \\\n" . + " apt-get install -y --no-install-recommends postgresql-common libpq-dev && \\\n" . " sed -i 's/^\\#create\\_main\\_cluster.*\$/create\\_main\\_cluster \\= false/' " . "/etc/postgresql-common/createcluster.conf"; } @@ -526,9 +517,7 @@ sub containerBuild } else { - $strScript .= - " apt-get install -y --no-install-recommends" . - ($strOS eq VM_U20 ? " -t \$(lsb_release -s -c)-pgdg-testing" : ''); + $strScript .= " apt-get install -y --no-install-recommends"; } # Construct list of databases to install diff --git a/test/lib/pgBackRestTest/Common/VmTest.pm b/test/lib/pgBackRestTest/Common/VmTest.pm index 0805c5131..0c52f07c9 100644 --- a/test/lib/pgBackRestTest/Common/VmTest.pm +++ b/test/lib/pgBackRestTest/Common/VmTest.pm @@ -40,8 +40,6 @@ use constant VM_IMAGE => 'image'; push @EXPORT, qw(VM_IMAGE); use constant VM_OS_BASE => 'os-base'; push @EXPORT, qw(VM_OS_BASE); -use constant VM_OS_REPO => 'os-repo'; - push @EXPORT, qw(VM_OS_REPO); use constant VMDEF_PGSQL_BIN => 'pgsql-bin'; push @EXPORT, qw(VMDEF_PGSQL_BIN); use constant VMDEF_LCOV_VERSION => 'lcov-version'; @@ -139,21 +137,20 @@ my $oyVm = &VM_DB => [ - PG_VERSION_95, - PG_VERSION_96, PG_VERSION_10, PG_VERSION_11, PG_VERSION_12, PG_VERSION_13, + PG_VERSION_14, ], &VM_DB_TEST => [ - PG_VERSION_96, PG_VERSION_10, PG_VERSION_11, PG_VERSION_12, PG_VERSION_13, + PG_VERSION_14, ], }, @@ -188,7 +185,6 @@ my $oyVm = &VM_U18 => { &VM_OS_BASE => VM_OS_BASE_DEBIAN, - &VM_OS_REPO => 'bionic', &VM_IMAGE => 'i386/ubuntu:18.04', &VM_ARCH => VM_ARCH_I386, &VMDEF_PGSQL_BIN => '/usr/lib/postgresql/{[version]}/bin', @@ -213,6 +209,7 @@ my $oyVm = PG_VERSION_91, PG_VERSION_92, PG_VERSION_93, + PG_VERSION_94, ], }, @@ -220,7 +217,6 @@ my $oyVm = &VM_U20 => { &VM_OS_BASE => VM_OS_BASE_DEBIAN, - &VM_OS_REPO => 'focal', &VM_IMAGE => 'ubuntu:20.04', &VM_ARCH => VM_ARCH_AMD64, &VMDEF_COVERAGE_C => true, @@ -248,9 +244,8 @@ my $oyVm = &VM_DB_TEST => [ - PG_VERSION_94, PG_VERSION_95, - PG_VERSION_14, + PG_VERSION_96, PG_VERSION_15, ], }, diff --git a/test/lib/pgBackRestTest/Env/Host/HostDbTest.pm b/test/lib/pgBackRestTest/Env/Host/HostDbTest.pm index 4d61d180d..14ff266aa 100644 --- a/test/lib/pgBackRestTest/Env/Host/HostDbTest.pm +++ b/test/lib/pgBackRestTest/Env/Host/HostDbTest.pm @@ -99,9 +99,13 @@ sub new if (!defined($$oParam{bStandby}) || !$$oParam{bStandby}) { - &log(WARN, "Testing against ${strDbVersionActual} ${strDevVersion} version"); + &log(WARN, 'Testing against ' . trim($strOutLog) . " ${strDevVersion}"); } } + elsif (!defined($$oParam{bStandby}) || !$$oParam{bStandby}) + { + &log(INFO, 'Testing against ' . trim($strOutLog)); + } # Don't run unit tests for unsupported versions my @stryVersionSupport = versionSupport();