diff --git a/test/container.yaml b/test/container.yaml index 0fca31396..8c1b85542 100644 --- a/test/container.yaml +++ b/test/container.yaml @@ -12,6 +12,10 @@ # - docker login -u pgbackrest # - VM=XXX;DATE=YYYYMMDDX;BASE=pgbackrest/test:${VM?}-base;docker tag ${BASE?} ${BASE?}-${DATE?} && docker push ${BASE?}-${DATE?} # ********************************************************************************************************************************** +20230525A: + x86_64: + u22: abc4c03323e07525917eb9d36a9a5a228bce5dcd) + 20230523A: x86_64: u20: 31c2124ab0db03d97eb6324e12e22eb64eb4a3b8 @@ -21,4 +25,3 @@ d10: 633def5323eeed51d7aa187ad1d61e854c47d6fa f36: 640d3ed0d9786ef61263e27a77686a331f72c58e rh7: 18dd0cbe19aa66dd9d72d312da5cb8c4bddea8b9 - u22: eba71d24c8636c7dfea5942f78a82a4566bef784 diff --git a/test/lib/pgBackRestTest/Common/ContainerTest.pm b/test/lib/pgBackRestTest/Common/ContainerTest.pm index 2bb07f262..9ec163484 100644 --- a/test/lib/pgBackRestTest/Common/ContainerTest.pm +++ b/test/lib/pgBackRestTest/Common/ContainerTest.pm @@ -509,14 +509,10 @@ sub containerBuild { $strScript .= " echo \"deb http://apt.postgresql.org/pub/repos/apt/ \$(lsb_release -s -c)-pgdg main" . - "\" >> /etc/apt/sources.list.d/pgdg.list && \\\n" . - ($strOS eq VM_U22 ? - " echo \"deb http://apt.postgresql.org/pub/repos/apt/ \$(lsb_release -s -c)-pgdg-snapshot main 16\"" . - " >> /etc/apt/sources.list.d/pgdg.list && \\\n" : '') . + ($strOS eq VM_U22 ? ' 16' : '') . "\" >> /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_U22 ? " -t \$(lsb_release -s -c)-pgdg-snapshot" : '') . " 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"; } @@ -532,9 +528,7 @@ sub containerBuild } else { - $strScript .= - " apt-get install -y --no-install-recommends" . - ($strOS eq VM_U22 ? " -t \$(lsb_release -s -c)-pgdg-snapshot" : ''); + $strScript .= " apt-get install -y --no-install-recommends"; } # Construct list of databases to install