From 1b8edb9a02ff42fe3a014622f7f7c36d5c2d5966 Mon Sep 17 00:00:00 2001 From: dinaharan <44108303+dinaharan@users.noreply.github.com> Date: Mon, 18 Jul 2022 00:58:06 -0700 Subject: [PATCH 1/3] Update Dockerfile Updated docker file to set the POSTGRESQL_PREV_VERSION environment variable for postgresql version 13. --- src/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Dockerfile b/src/Dockerfile index 13cc091f..bd0b92d6 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -11,7 +11,7 @@ FROM {{ spec.s2i_base }} # PostgreSQL administrative account ENV POSTGRESQL_VERSION={{ spec.version }} \ - {% if spec.prod != "rhel8" or spec.prod != "rhel9" or spec.version == "10" %} + {% if spec.prod != "rhel8" or spec.prod != "rhel9" or spec.version == "10" or spec.version == "13" %} POSTGRESQL_PREV_VERSION={{ spec.prev_version }} \ {% endif %} HOME=/var/lib/pgsql \ From a4b06c41f233b2b64b64790313445b481d4dc733 Mon Sep 17 00:00:00 2001 From: dinaharan <44108303+dinaharan@users.noreply.github.com> Date: Thu, 21 Jul 2022 07:05:17 -0700 Subject: [PATCH 2/3] Update run_test Removed RHEL8 from validation so that upgrade test runs for RHEL 8. --- test/run_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/run_test b/test/run_test index 84a40c73..50549ad0 100755 --- a/test/run_test +++ b/test/run_test @@ -652,7 +652,7 @@ run_upgrade_test () { # Do not run on Fedora or RHEL8 until the upgrade script # is fixed for non-SCL use cases - { [ "${OS}" == "fedora" ] || [ "${OS}" == "rhel8" ]; } && return 0 + { [ "${OS}" == "fedora" ] } && return 0 local upgrade_path="none 9.2 9.4 9.5 9.6 10 12 13 none" prev= act= for act in $upgrade_path; do From 4f1a39ee14edafb26dd794e9dd4294f946603dbd Mon Sep 17 00:00:00 2001 From: Dinaharan Ayyalusamy Date: Fri, 22 Jul 2022 05:03:42 +0000 Subject: [PATCH 3/3] Updated run_test file to fix the missing semicolon --- test/run_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/run_test b/test/run_test index 50549ad0..e11f0be5 100755 --- a/test/run_test +++ b/test/run_test @@ -652,7 +652,7 @@ run_upgrade_test () { # Do not run on Fedora or RHEL8 until the upgrade script # is fixed for non-SCL use cases - { [ "${OS}" == "fedora" ] } && return 0 + { [ "${OS}" == "fedora" ]; } && return 0 local upgrade_path="none 9.2 9.4 9.5 9.6 10 12 13 none" prev= act= for act in $upgrade_path; do