From 12eb86998a1c9ca4abf2c4b3b7e61b4be5f0ee0d Mon Sep 17 00:00:00 2001 From: Pavan Navarathna <6504783+pavannd1@users.noreply.github.com> Date: Mon, 2 Oct 2023 12:07:55 -0700 Subject: [PATCH 1/4] Revert "Temporarily disable Postgres tests (#2367)" This reverts commit 06be966f576ed850e705a9fc31a475a512a7d2bc. --- build/integration-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/integration-test.sh b/build/integration-test.sh index cd3e0d50e0..a64eea8c59 100755 --- a/build/integration-test.sh +++ b/build/integration-test.sh @@ -26,7 +26,7 @@ TEST_TIMEOUT="30m" TEST_OPTIONS="-tags=integration -timeout ${TEST_TIMEOUT} -check.suitep ${DOP}" # Regex to match apps to run in short mode # Temporary disable ES test. Issue to track https://github.com/kanisterio/kanister/issues/1920 -SHORT_APPS="^MySQL$|^MongoDB$|Maria|^MSSQL$" +SHORT_APPS="^PostgreSQL$|^MySQL$|^MongoDB$|Maria|^MSSQL$" # OCAPPS has all the apps that are to be tested against openshift cluster OC_APPS3_11="MysqlDBDepConfig$|MongoDBDepConfig$|PostgreSQLDepConfig$" OC_APPS4_4="MysqlDBDepConfig4_4|MongoDBDepConfig4_4|PostgreSQLDepConfig4_4" From 7eb9ec49a785b5f94a3c7bea2b640b1c3ca75d16 Mon Sep 17 00:00:00 2001 From: Akanksha Kumari Date: Tue, 3 Oct 2023 14:37:02 +0530 Subject: [PATCH 2/4] Disable mysql app from integration test Signed-off-by: Akanksha Kumari --- build/integration-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/integration-test.sh b/build/integration-test.sh index a64eea8c59..61339808fc 100755 --- a/build/integration-test.sh +++ b/build/integration-test.sh @@ -26,7 +26,7 @@ TEST_TIMEOUT="30m" TEST_OPTIONS="-tags=integration -timeout ${TEST_TIMEOUT} -check.suitep ${DOP}" # Regex to match apps to run in short mode # Temporary disable ES test. Issue to track https://github.com/kanisterio/kanister/issues/1920 -SHORT_APPS="^PostgreSQL$|^MySQL$|^MongoDB$|Maria|^MSSQL$" +SHORT_APPS="^PostgreSQL$|^MongoDB$|Maria|^MSSQL$" # OCAPPS has all the apps that are to be tested against openshift cluster OC_APPS3_11="MysqlDBDepConfig$|MongoDBDepConfig$|PostgreSQLDepConfig$" OC_APPS4_4="MysqlDBDepConfig4_4|MongoDBDepConfig4_4|PostgreSQLDepConfig4_4" From 7f1a752405da3cd0a33b35fbeeccdd37cfcb0759 Mon Sep 17 00:00:00 2001 From: Akanksha Kumari Date: Tue, 3 Oct 2023 15:45:35 +0530 Subject: [PATCH 3/4] Revert "Disable mysql app from integration test" This reverts commit 7eb9ec49a785b5f94a3c7bea2b640b1c3ca75d16. --- build/integration-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/integration-test.sh b/build/integration-test.sh index 61339808fc..a64eea8c59 100755 --- a/build/integration-test.sh +++ b/build/integration-test.sh @@ -26,7 +26,7 @@ TEST_TIMEOUT="30m" TEST_OPTIONS="-tags=integration -timeout ${TEST_TIMEOUT} -check.suitep ${DOP}" # Regex to match apps to run in short mode # Temporary disable ES test. Issue to track https://github.com/kanisterio/kanister/issues/1920 -SHORT_APPS="^PostgreSQL$|^MongoDB$|Maria|^MSSQL$" +SHORT_APPS="^PostgreSQL$|^MySQL$|^MongoDB$|Maria|^MSSQL$" # OCAPPS has all the apps that are to be tested against openshift cluster OC_APPS3_11="MysqlDBDepConfig$|MongoDBDepConfig$|PostgreSQLDepConfig$" OC_APPS4_4="MysqlDBDepConfig4_4|MongoDBDepConfig4_4|PostgreSQLDepConfig4_4" From 331480b9432b12116775401f2cec33553de70983 Mon Sep 17 00:00:00 2001 From: Pavan Navarathna <6504783+pavannd1@users.noreply.github.com> Date: Tue, 3 Oct 2023 12:13:15 -0700 Subject: [PATCH 4/4] Remove Maria DB --- build/integration-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/integration-test.sh b/build/integration-test.sh index a64eea8c59..419f745d54 100755 --- a/build/integration-test.sh +++ b/build/integration-test.sh @@ -26,7 +26,7 @@ TEST_TIMEOUT="30m" TEST_OPTIONS="-tags=integration -timeout ${TEST_TIMEOUT} -check.suitep ${DOP}" # Regex to match apps to run in short mode # Temporary disable ES test. Issue to track https://github.com/kanisterio/kanister/issues/1920 -SHORT_APPS="^PostgreSQL$|^MySQL$|^MongoDB$|Maria|^MSSQL$" +SHORT_APPS="^PostgreSQL$|^MySQL$|^MongoDB$|^MSSQL$" # OCAPPS has all the apps that are to be tested against openshift cluster OC_APPS3_11="MysqlDBDepConfig$|MongoDBDepConfig$|PostgreSQLDepConfig$" OC_APPS4_4="MysqlDBDepConfig4_4|MongoDBDepConfig4_4|PostgreSQLDepConfig4_4"