diff --git a/pkg/28.2.0/config.sh b/pkg/28.2.0/config.sh index d9b8e45..6f89ab7 100644 --- a/pkg/28.2.0/config.sh +++ b/pkg/28.2.0/config.sh @@ -2,10 +2,6 @@ DOCKER_GIT_COMMIT="bedc5d6b3e782a5e50d3d2a870f5e1f1b5a38d5c" -TEST_OS_IMAGE_NAME=(oraclelinux ubuntu rockylinux redhat/ubi9 quay.io/centos/centos redhat/ubi8) -TEST_OS_IMAGE_TAG[0]="8 9" -TEST_OS_IMAGE_TAG[1]="22.04 24.04" -TEST_OS_IMAGE_TAG[2]="8 9" -TEST_OS_IMAGE_TAG[3]="9.4" -TEST_OS_IMAGE_TAG[4]="stream9" -TEST_OS_IMAGE_TAG[5]="8.9" +TEST_OS_IMAGE_NAME=(ubuntu quay.io/centos/centos) +TEST_OS_IMAGE_TAG[0]="22.04 24.04" +TEST_OS_IMAGE_TAG[1]="stream9" diff --git a/pkg/28.2.1/config.sh b/pkg/28.2.1/config.sh index d9b8e45..6f89ab7 100644 --- a/pkg/28.2.1/config.sh +++ b/pkg/28.2.1/config.sh @@ -2,10 +2,6 @@ DOCKER_GIT_COMMIT="bedc5d6b3e782a5e50d3d2a870f5e1f1b5a38d5c" -TEST_OS_IMAGE_NAME=(oraclelinux ubuntu rockylinux redhat/ubi9 quay.io/centos/centos redhat/ubi8) -TEST_OS_IMAGE_TAG[0]="8 9" -TEST_OS_IMAGE_TAG[1]="22.04 24.04" -TEST_OS_IMAGE_TAG[2]="8 9" -TEST_OS_IMAGE_TAG[3]="9.4" -TEST_OS_IMAGE_TAG[4]="stream9" -TEST_OS_IMAGE_TAG[5]="8.9" +TEST_OS_IMAGE_NAME=(ubuntu quay.io/centos/centos) +TEST_OS_IMAGE_TAG[0]="22.04 24.04" +TEST_OS_IMAGE_TAG[1]="stream9" diff --git a/pkg/28.2.2/config.sh b/pkg/28.2.2/config.sh index d9b8e45..6f89ab7 100644 --- a/pkg/28.2.2/config.sh +++ b/pkg/28.2.2/config.sh @@ -2,10 +2,6 @@ DOCKER_GIT_COMMIT="bedc5d6b3e782a5e50d3d2a870f5e1f1b5a38d5c" -TEST_OS_IMAGE_NAME=(oraclelinux ubuntu rockylinux redhat/ubi9 quay.io/centos/centos redhat/ubi8) -TEST_OS_IMAGE_TAG[0]="8 9" -TEST_OS_IMAGE_TAG[1]="22.04 24.04" -TEST_OS_IMAGE_TAG[2]="8 9" -TEST_OS_IMAGE_TAG[3]="9.4" -TEST_OS_IMAGE_TAG[4]="stream9" -TEST_OS_IMAGE_TAG[5]="8.9" +TEST_OS_IMAGE_NAME=(ubuntu quay.io/centos/centos) +TEST_OS_IMAGE_TAG[0]="22.04 24.04" +TEST_OS_IMAGE_TAG[1]="stream9" diff --git a/scripts/test-docker b/scripts/test-docker index 62563bf..2401d2e 100755 --- a/scripts/test-docker +++ b/scripts/test-docker @@ -15,14 +15,14 @@ done test_docker_versions["ubuntu:22.04"]="^23.0.([4-9]|[1-9]\d)$|^24.0|^25.0|^26.0|^26.1|^27.0|^27.1|^28.0|^28.1|^28.2|^28.3" -test_docker_versions["ubuntu:24.04"]="^26.0|^26.1|^27.0|^27.1|^28.0|^28.1" -test_docker_versions["quay.io/centos/centos:stream9"]="^24.0|^25.0|^26.0|^26.1|^27.0|^27.1|^28.0|^28.1" -test_docker_versions["oraclelinux:8"]="^23.0.([4-9]|[1-9]\d)$|^24.0|^25.0|^26.0|^26.1|^27.0|^27.1|^28.0|^28.1" -test_docker_versions["oraclelinux:9"]="^23.0.([4-9]|[1-9]\d)$|^24.0|^25.0|^26.0|^26.1|^27.0|^27.1|^28.0|^28.1" -test_docker_versions["rockylinux:8"]="^23.0.([4-9]|[1-9]\d)$|^24.0|^25.0|^26.0|^26.1|^27.0|^27.1|^28.0|^28.1" -test_docker_versions["rockylinux:9"]="^23.0.([4-9]|[1-9]\d)$|^24.0|^25.0|^26.0|^26.1|^27.0|^27.1|^28.0|^28.1" -test_docker_versions["redhat/ubi8:8.9"]="^23.0.([4-9]|[1-9]\d)$|^24.0|^25.0|^26.0|^26.1|^27.0|^27.1|^28.0|^28.1" -test_docker_versions["redhat/ubi9:9.4"]="^23.0.([4-9]|[1-9]\d)$|^24.0|^25.0|^26.0|^26.1|^27.0|^27.1|^28.0|^28.1" +test_docker_versions["ubuntu:24.04"]="^26.0|^26.1|^27.0|^27.1|^28.0|^28.1|^28.2|^28.3" +test_docker_versions["quay.io/centos/centos:stream9"]="^24.0|^25.0|^26.0|^26.1|^27.0|^27.1|^28.0|^28.1|^28.2|^28.3" +test_docker_versions["oraclelinux:8"]="^27.0|^27.1|^28.0|^28.1|^28.2|^28.3" +test_docker_versions["oraclelinux:9"]="^23.0.([4-9]|[1-9]\d)$|^24.0|^25.0|^26.0|^26.1|^27.0|^27.1|^28.0|^28.1|^28.2|^28.3" +test_docker_versions["rockylinux:8"]="^23.0.([4-9]|[1-9]\d)$|^24.0|^25.0|^26.0|^26.1|^27.0|^27.1|^28.0|^28.1|^28.3" +test_docker_versions["rockylinux:9"]="^23.0.([4-9]|[1-9]\d)$|^24.0|^25.0|^26.0|^26.1|^27.0|^27.1|^28.0|^28.1|^28.3" +test_docker_versions["redhat/ubi8:8.9"]="^27.0|^27.1|^28.0|^28.1|^28.2|^28.3" +test_docker_versions["redhat/ubi9:9.4"]="^23.0.([4-9]|[1-9]\d)$|^24.0|^25.0|^26.0|^26.1|^27.0|^27.1|^28.0|^28.1|^28.2|^28.3" echo "==> Testing install-docker scripts..." for DOCKER_VERSION_SCRIPT in $(find ../dist/ -mindepth 1 -type f -exec basename {} \; | sort -V); do