Skip to content

Commit 02f9dcc

Browse files
authored
Merge pull request #249 from swastik959/bump-docker
2 parents e410bae + 7b19583 commit 02f9dcc

File tree

4 files changed

+17
-29
lines changed

4 files changed

+17
-29
lines changed

pkg/28.2.0/config.sh

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
DOCKER_GIT_COMMIT="bedc5d6b3e782a5e50d3d2a870f5e1f1b5a38d5c"
44

5-
TEST_OS_IMAGE_NAME=(oraclelinux ubuntu rockylinux redhat/ubi9 quay.io/centos/centos redhat/ubi8)
6-
TEST_OS_IMAGE_TAG[0]="8 9"
7-
TEST_OS_IMAGE_TAG[1]="22.04 24.04"
8-
TEST_OS_IMAGE_TAG[2]="8 9"
9-
TEST_OS_IMAGE_TAG[3]="9.4"
10-
TEST_OS_IMAGE_TAG[4]="stream9"
11-
TEST_OS_IMAGE_TAG[5]="8.9"
5+
TEST_OS_IMAGE_NAME=(ubuntu quay.io/centos/centos)
6+
TEST_OS_IMAGE_TAG[0]="22.04 24.04"
7+
TEST_OS_IMAGE_TAG[1]="stream9"

pkg/28.2.1/config.sh

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
DOCKER_GIT_COMMIT="bedc5d6b3e782a5e50d3d2a870f5e1f1b5a38d5c"
44

5-
TEST_OS_IMAGE_NAME=(oraclelinux ubuntu rockylinux redhat/ubi9 quay.io/centos/centos redhat/ubi8)
6-
TEST_OS_IMAGE_TAG[0]="8 9"
7-
TEST_OS_IMAGE_TAG[1]="22.04 24.04"
8-
TEST_OS_IMAGE_TAG[2]="8 9"
9-
TEST_OS_IMAGE_TAG[3]="9.4"
10-
TEST_OS_IMAGE_TAG[4]="stream9"
11-
TEST_OS_IMAGE_TAG[5]="8.9"
5+
TEST_OS_IMAGE_NAME=(ubuntu quay.io/centos/centos)
6+
TEST_OS_IMAGE_TAG[0]="22.04 24.04"
7+
TEST_OS_IMAGE_TAG[1]="stream9"

pkg/28.2.2/config.sh

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
DOCKER_GIT_COMMIT="bedc5d6b3e782a5e50d3d2a870f5e1f1b5a38d5c"
44

5-
TEST_OS_IMAGE_NAME=(oraclelinux ubuntu rockylinux redhat/ubi9 quay.io/centos/centos redhat/ubi8)
6-
TEST_OS_IMAGE_TAG[0]="8 9"
7-
TEST_OS_IMAGE_TAG[1]="22.04 24.04"
8-
TEST_OS_IMAGE_TAG[2]="8 9"
9-
TEST_OS_IMAGE_TAG[3]="9.4"
10-
TEST_OS_IMAGE_TAG[4]="stream9"
11-
TEST_OS_IMAGE_TAG[5]="8.9"
5+
TEST_OS_IMAGE_NAME=(ubuntu quay.io/centos/centos)
6+
TEST_OS_IMAGE_TAG[0]="22.04 24.04"
7+
TEST_OS_IMAGE_TAG[1]="stream9"

scripts/test-docker

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ done
1515

1616

1717
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"
18-
test_docker_versions["ubuntu:24.04"]="^26.0|^26.1|^27.0|^27.1|^28.0|^28.1"
19-
test_docker_versions["quay.io/centos/centos:stream9"]="^24.0|^25.0|^26.0|^26.1|^27.0|^27.1|^28.0|^28.1"
20-
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"
21-
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"
22-
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"
23-
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"
24-
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"
25-
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"
18+
test_docker_versions["ubuntu:24.04"]="^26.0|^26.1|^27.0|^27.1|^28.0|^28.1|^28.2|^28.3"
19+
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"
20+
test_docker_versions["oraclelinux:8"]="^27.0|^27.1|^28.0|^28.1|^28.2|^28.3"
21+
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"
22+
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"
23+
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"
24+
test_docker_versions["redhat/ubi8:8.9"]="^27.0|^27.1|^28.0|^28.1|^28.2|^28.3"
25+
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"
2626

2727
echo "==> Testing install-docker scripts..."
2828
for DOCKER_VERSION_SCRIPT in $(find ../dist/ -mindepth 1 -type f -exec basename {} \; | sort -V); do

0 commit comments

Comments
 (0)