Skip to content

Commit 4e09055

Browse files
phracekphracek
committed
Remove version 10 from GitHub Actions, README's
templates and imagestreams Signed-off-by: Petr "Stone" Hracek <[email protected]>
1 parent 6c685c3 commit 4e09055

13 files changed

+14
-67
lines changed

‎.github/workflows/container-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
strategy:
5858
fail-fast: false
5959
matrix:
60-
version: [ "10", "11", "12", "13", "14", "15", "16" ]
60+
version: [ "11", "12", "13", "14", "15", "16" ]
6161
os_test: [ "fedora", "rhel8", "rhel9", "c9s" ]
6262
test_case: [ "container" ]
6363

‎.github/workflows/openshift-pytests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
fail-fast: false
2929
matrix:
30-
version: [ "10", "12", "13", "14", "15", "16" ]
30+
version: [ "12", "13", "14", "15", "16" ]
3131
os_test: [ "rhel8", "rhel9"]
3232
test_case: [ "openshift-pytest" ]
3333

‎.github/workflows/openshift-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
strategy:
4848
fail-fast: false
4949
matrix:
50-
version: [ "10", "11", "12", "13", "15", "16" ]
50+
version: [ "11", "12", "13", "15", "16" ]
5151
os_test: [ "rhel8", "rhel9"]
5252
test_case: [ "openshift-4" ]
5353
steps:

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Variables are documented in common/build.sh.
22
BASE_IMAGE_NAME = postgresql
3-
VERSIONS = 10 12 13 14 15 16
3+
VERSIONS = 12 13 14 15 16
44
OPENSHIFT_NAMESPACES = 9.2
55
NOT_RELEASED_VERSIONS =
66

‎README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ For learning more information about concepts used in these container images, see
2323

2424
PostgreSQL versions currently supported are:
2525

26-
- [postgresql-10](https://github.com/sclorg/postgresql-container/tree/master/10)
2726
- [postgresql-12](https://github.com/sclorg/postgresql-container/tree/master/12)
2827
- [postgresql-13](https://github.com/sclorg/postgresql-container/tree/master/13)
2928
- [postgresql-14](https://github.com/sclorg/postgresql-container/tree/master/14)
@@ -99,7 +98,6 @@ To contribute, please follow these steps:
9998

10099
For detailed information on the usage of specific PostgreSQL Dockerfiles, please refer to the corresponding usage documentation:
101100

102-
- [PostgreSQL 10 Usage Documentation](https://github.com/sclorg/postgresql-container/tree/master/10)
103101
- [PostgreSQL 12 Usage Documentation](https://github.com/sclorg/postgresql-container/tree/master/12)
104102
- [PostgreSQL 13 Usage Documentation](https://github.com/sclorg/postgresql-container/tree/master/13)
105103
- [PostgreSQL 14 Usage Documentation](https://github.com/sclorg/postgresql-container/tree/master/14)

‎examples/postgresql-ephemeral-template.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@
228228
{
229229
"name": "POSTGRESQL_VERSION",
230230
"displayName": "Version of PostgreSQL Image",
231-
"description": "Version of PostgreSQL image to be used (10-el7, 10-el8, or latest).",
232-
"value": "10-el8",
231+
"description": "Version of PostgreSQL image to be used (13-el8, 15-el8, or latest).",
232+
"value": "15-el8",
233233
"required": true
234234
}
235235
]

‎examples/postgresql-persistent-template.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@
252252
{
253253
"name": "POSTGRESQL_VERSION",
254254
"displayName": "Version of PostgreSQL Image",
255-
"description": "Version of PostgreSQL image to be used (10-el7, 10-el8, or latest).",
256-
"value": "10-el8",
255+
"description": "Version of PostgreSQL image to be used (13-el8, 15-el8, or latest).",
256+
"value": "15-el8",
257257
"required": true
258258
}
259259
]

‎imagestreams/imagestreams.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
latest: "16-el9"
2020
distros:
2121
- name: RHEL 8
22-
app_versions: [10, 12, 13, 15, 16]
22+
app_versions: [12, 13, 15, 16]
2323

2424
- name: RHEL 9
2525
app_versions: [13, 15, 16]
@@ -28,7 +28,7 @@
2828
latest: "16-el9"
2929
distros:
3030
- name: RHEL 8
31-
app_versions: [10, 12, 13, 15, 16]
31+
app_versions: [12, 13, 15, 16]
3232

3333
- name: RHEL 9
3434
app_versions: [13, 15, 16]

‎imagestreams/postgresql-rhel-aarch64.json

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,6 @@
99
},
1010
"spec": {
1111
"tags": [
12-
{
13-
"name": "10-el8",
14-
"annotations": {
15-
"openshift.io/display-name": "PostgreSQL 10 (RHEL 8)",
16-
"openshift.io/provider-display-name": "Red Hat, Inc.",
17-
"description": "Provides a PostgreSQL 10 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.",
18-
"iconClass": "icon-postgresql",
19-
"tags": "database,postgresql",
20-
"version": "10"
21-
},
22-
"from": {
23-
"kind": "DockerImage",
24-
"name": "registry.redhat.io/rhel8/postgresql-10:latest"
25-
},
26-
"referencePolicy": {
27-
"type": "Local"
28-
}
29-
},
3012
{
3113
"name": "12-el8",
3214
"annotations": {

‎imagestreams/postgresql-rhel.json

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,6 @@
99
},
1010
"spec": {
1111
"tags": [
12-
{
13-
"name": "10-el8",
14-
"annotations": {
15-
"openshift.io/display-name": "PostgreSQL 10 (RHEL 8)",
16-
"openshift.io/provider-display-name": "Red Hat, Inc.",
17-
"description": "Provides a PostgreSQL 10 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.",
18-
"iconClass": "icon-postgresql",
19-
"tags": "database,postgresql",
20-
"version": "10"
21-
},
22-
"from": {
23-
"kind": "DockerImage",
24-
"name": "registry.redhat.io/rhel8/postgresql-10:latest"
25-
},
26-
"referencePolicy": {
27-
"type": "Local"
28-
}
29-
},
3012
{
3113
"name": "12-el8",
3214
"annotations": {

‎specs/multispec.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,6 @@ specs:
5656
{ yum -y module enable postgresql:{{ spec.version }} || :; } && \
5757
5858
version:
59-
"10":
60-
version: "10"
61-
prev_version: "9.6"
62-
short: "10"
63-
prev_short: "96"
64-
common_image_name: "{{ spec.org }}/postgresql-10-{{ spec.prod }}"
65-
rhel_image_name: "rhel8/postgresql-{{ spec.short }}"
66-
latest_fedora: "f34"
67-
6859
"12":
6960
version: "12"
7061
prev_version: "10"
@@ -115,9 +106,6 @@ specs:
115106

116107
matrix:
117108
include:
118-
- version: "10"
119-
distros:
120-
- rhel-8-x86_64
121109
- version: "12"
122110
distros:
123111
- rhel-8-x86_64

‎test/run_test

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ run_upgrade_test ()
686686
{
687687
local ret=0
688688

689-
local upgrade_path="none 9.2 9.4 9.5 9.6 10 12 13 none" prev= act=
689+
local upgrade_path="none 12 13 15 16 none" prev= act=
690690
for act in $upgrade_path; do
691691
if test "$act" = $VERSION; then
692692
break
@@ -711,12 +711,7 @@ run_migration_test ()
711711
[ "${OS}" == "fedora" ] && return 0
712712

713713
local from_version
714-
# Only test a subset of the migration path on non-intel hosts
715-
if [ "$(uname -m)" == "x86_64" ]; then
716-
local upgrade_path="9.2 9.4 9.5 9.6 10 12 13 15"
717-
else
718-
local upgrade_path="10 12 13 15"
719-
fi
714+
local upgrade_path="12 13 15 16"
720715

721716
for from_version in $upgrade_path; do
722717
# Do not test migration from $VERSION:remote to $VERSION:local

‎test/run_upgrade_test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,15 @@ assert_upgrade_succeeds ()
7474
info "Upgrading to $upgrade_to"
7575
UPGRADE_IMAGE=$(get_image_id "$upgrade_to")
7676
run_server "$DATADIR" "$UPGRADE_IMAGE" "-e POSTGRESQL_UPGRADE=$1"
77+
docker logs "$CID"
7778
wait_for_postgres "$CID"
7879
eval "data_${dataspec}_check"
7980
debug "the upgrading container of version '$upgrade_to' responded"
8081
docker stop "$CID" >/dev/null
8182
docker rm -f "$CID" >/dev/null
8283

8384
run_server "$DATADIR" "$UPGRADE_IMAGE"
85+
docker logs "$CID"
8486
wait_for_postgres "$CID"
8587
eval "data_${dataspec}_check"
8688
debug "restarted server of version '$upgrade_to' responded"

0 commit comments

Comments
 (0)