From c1587ed4343201b1850f54f9fa869cd37d1c7583 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 8 Jun 2015 17:44:40 +0200 Subject: * postgresql-tests/lib_pgsql.sh (dtf_postgresql_upgrade_matrix): Fix the matrix mainly for f22 and f23. --- postgresql-tests/lib_pgsql.sh | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/postgresql-tests/lib_pgsql.sh b/postgresql-tests/lib_pgsql.sh index e1fa3b0..a1321e6 100644 --- a/postgresql-tests/lib_pgsql.sh +++ b/postgresql-tests/lib_pgsql.sh @@ -76,11 +76,18 @@ dtf_postgresql_unpack_remote_data() # where DISTRO may be rhel/fedora, VERSION may be e.g. 6.6 for rhel or 20 for # Fedora. ACTION is either run or upgrade and it means whether currently # installed PostgreSQL server is able to RUN the older data from DISTRO-VERSION -# or it should be first UPGRADEd. +# or it should be first upgraded. # -# What versions are currently in Fedoras: -# f17(9.1.9); f18(9.2.5); f19(9.2.9); f20(9.3.5); f21(9.3.5); -# rawhide(9.3.5) +# What versions are currently in supported Fedora versions: +# +# f20 & f21 (9.3.8) +# f22 & rawhide (9.4.3) +# +# Older Fedora versions: +# +# f17 (9.1.9) +# f18 (9.2.5) +# f19 (9.2.9) dtf_postgresql_upgrade_matrix() { @@ -97,9 +104,11 @@ dtf_postgresql_upgrade_matrix() echo fedora 20 run echo fedora 21 run elif rlIsFedora 22; then - echo fedora 19 upgrade - echo fedora 20 run - echo fedora 21 run + echo fedora 20 upgrade + echo fedora 21 upgrade + elif rlIsFedora 23; then + echo fedora 20 upgrade + echo fedora 21 upgrade echo fedora 22 run fi } -- cgit