Makefile

@@ -34,6 +34,7 @@ BUILD_DIR := build
 SUPPORTED := ubuntu-20.04 \
              ubuntu-22.04 \
              ubuntu-24.04 \
+	     debian-10 \
 	     debian-11 \
 	     debian-12 \
 	     debian-13 \
@@ -41,7 +42,6 @@ SUPPORTED := ubuntu-20.04 \
 	     rockylinux-9 \
 	     rockylinux-10 \
 	     oraclelinux-7 \
-	     amazonlinux-2 \
 	     amazonlinux-2023 \
 	     gentoo
 
@@ -219,21 +219,18 @@ ubuntu-%-install-test:
 	     bash -c 'apt-get update && apt-get install -y /output/$(PACKAGE_NAME)-$(DEB_VERSION)-ubuntu-$*.deb'
 
 # Run an OracleLinux install test (this is for EL7 since CentOS7 images no longer exist)
-oraclelinux-%-install-test: MGR=$(intcmp $*, 7, yum, yum, dnf)
 oraclelinux-%-install-test:
 	docker run --rm \
 	     -v ./$(BUILD_DIR):/output \
-	     oraclelinux:$* \
+	     oraclelinux:7 \
-	     bash -c '$(MGR) makecache && $(MGR) install -y /output/$(PACKAGE_NAME)-$(RPM_VERSION).el7.noarch.rpm'
+	     bash -c 'yum makecache && yum install -y /output/$(PACKAGE_NAME)-$(RPM_VERSION).el7.noarch.rpm'
 
 # Run a Amazon Linux install test
-# Note: AL2 is too old for dnf
-amazonlinux-%-install-test: MGR=$(intcmp $*, 2, yum, yum, dnf)
 amazonlinux-%-install-test:
 	docker run --rm \
 	     -v ./$(BUILD_DIR):/output \
 	     amazonlinux:$* \
-	     bash -c '$(MGR) makecache && $(MGR) install -y /output/$(PACKAGE_NAME)-$(RPM_VERSION).amzn$*.noarch.rpm'
+	     bash -c 'dnf makecache && dnf install -y /output/$(PACKAGE_NAME)-$(RPM_VERSION).amzn$*.noarch.rpm'
 
 # Run a Gentoo install test
 gentoo-install-test:
@@ -298,31 +295,15 @@ actually-package-ubuntu-%:
 	dpkg-deb -Zgzip --build /output/ubuntu-$* "/output/$(PACKAGE_NAME)-$(DEB_VERSION)-ubuntu-$*.deb"
 
 # OracleLinux package creation
-# Note: This needs to work inside OEL7, so we can't use intcmp
-actually-package-oraclelinux-7:
-	mkdir -p /output/oraclelinux-7/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-	sed -e "s/@@VERSION@@/$(VERSION)/g" -e "s/@@RELEASE@@/$(RPM_RELEASE)/g" RPM/$(PACKAGE_NAME)-el7.spec > /output/oraclelinux-7/SPECS/$(PACKAGE_NAME).spec
-	rpmbuild --define '_topdir /output/oraclelinux-7' \
-	         --define 'version $(RPM_VERSION)' \
-	         -bb /output/oraclelinux-7/SPECS/$(PACKAGE_NAME).spec
-	cp /output/oraclelinux-7/RPMS/noarch/$(PACKAGE_NAME)-$(RPM_VERSION).el7.noarch.rpm /output/
 actually-package-oraclelinux-%:
 	mkdir -p /output/oraclelinux-$*/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-	sed -e "s/@@VERSION@@/$(VERSION)/g" -e "s/@@RELEASE@@/$(RPM_RELEASE)/g" RPM/$(PACKAGE_NAME).spec > /output/oraclelinux-$*/SPECS/$(PACKAGE_NAME).spec
+	sed -e "s/@@VERSION@@/$(VERSION)/g" -e "s/@@RELEASE@@/$(RPM_RELEASE)/g" RPM/$(PACKAGE_NAME)-el7.spec > /output/oraclelinux-$*/SPECS/$(PACKAGE_NAME).spec
 	rpmbuild --define '_topdir /output/oraclelinux-$*' \
 	         --define 'version $(RPM_VERSION)' \
 	         -bb /output/oraclelinux-$*/SPECS/$(PACKAGE_NAME).spec
 	cp /output/oraclelinux-$*/RPMS/noarch/$(PACKAGE_NAME)-$(RPM_VERSION).el$*.noarch.rpm /output/
 
 # Amazon Linux package creation
-# Note: This needs to work inside AL2, so we can't use intcmp
-actually-package-amazonlinux-2:
-	mkdir -p /output/amazonlinux-2/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-	sed -e "s/@@VERSION@@/$(VERSION)/g" -e "s/@@RELEASE@@/$(RPM_RELEASE)/g" RPM/$(PACKAGE_NAME)-el7.spec > /output/amazonlinux-2/SPECS/$(PACKAGE_NAME).spec
-	rpmbuild --define '_topdir /output/amazonlinux-2' \
-	         --define 'version $(RPM_VERSION)' \
-	         -bb /output/amazonlinux-2/SPECS/$(PACKAGE_NAME).spec
-	cp /output/amazonlinux-2/RPMS/noarch/$(PACKAGE_NAME)-$(RPM_VERSION).amzn2.noarch.rpm /output/
 actually-package-amazonlinux-%:
 	mkdir -p /output/amazonlinux-$*/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 	sed -e "s/@@VERSION@@/$(VERSION)/g" -e "s/@@RELEASE@@/$(RPM_RELEASE)/g" RPM/$(PACKAGE_NAME).spec > /output/amazonlinux-$*/SPECS/$(PACKAGE_NAME).spec

docker/Dockerfile-amazonlinux

@@ -8,11 +8,10 @@ FROM ${DISTRO}:${RELEASE}
 ARG DISTRO
 ARG RELEASE
 
-RUN if [ ${RELEASE} -le 2 ] ; then MGR=yum ; else MGR=dnf ; fi && \
+RUN dnf install -y \
-    ${MGR} install -y \
     rpm-build \
     make \
-    && ${MGR} clean all
+    && dnf clean all
 
 RUN echo -e "#!/bin/bash\nmake actually-package-${DISTRO}-${RELEASE}" > /init.sh \
     && chmod 755 /init.sh

docker/Dockerfile-oraclelinux

@@ -8,12 +8,11 @@ FROM ${DISTRO}:${RELEASE}
 ARG DISTRO
 ARG RELEASE
 
-RUN if [ ${RELEASE} -le 7 ] ; then MGR=yum ; else MGR=dnf ; fi && \
+RUN yum install -y \
-    ${MGR} install -y \
     rpm-build \
     make \
-    oracle-epel-release-el${RELEASE} \
+    oracle-epel-release-el7 \
-    && ${MGR} clean all
+    && yum clean all
 
 RUN echo -e "#!/bin/bash\nmake actually-package-${DISTRO}-${RELEASE}" > /init.sh \
     && chmod 755 /init.sh

tests/docker-compose.yml

@@ -20,7 +20,7 @@ services:
       POSTGRES_PASSWORD: secret
     healthcheck:
       #test: [ "CMD", "pg_isready", "-U", "postgres" ]
-      test: [ "CMD-SHELL", "pg_controldata $(psql -At -U postgres -c 'show data_directory') | grep -q 'in production'" ]
+      test: [ "CMD-SHELL", "pg_controldata /var/lib/postgresql/data/ | grep -q 'in production'" ]
       interval: 5s
       timeout: 2s
       retries: 40

tests/run-tests.sh

@@ -24,7 +24,6 @@ images["14"]='14-bookworm'
 images["15"]='15-bookworm'
 images["16"]='16-bookworm'
 images["17"]='17-bookworm'
-images["18"]='18-trixie'
 
 declare -A results=()