[OSS ONLY] Finalize BABEL_2_10_STABLE (#2850)

Disable TDS fault injection. Update DEFAULT_BRANCH to point to stable branch. Update workflows to point to stable branch. Signed-off-by: Rishabh Tanwar [email protected]
babelfish-for-postgresql · Aug 14, 2024 · 21c072a · 21c072a
1 parent 9c8a502
commit 21c072a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.github/scripts/clone_engine_repo.conf b/.github/scripts/clone_engine_repo.conf
@@ -1 +1 @@
-DEFAULT_BRANCH=BABEL_2_X_DEV__PG_14_X
+DEFAULT_BRANCH=BABEL_2_10_STABLE__PG_14_13
diff --git a/.github/workflows/major-version-upgrade.yml b/.github/workflows/major-version-upgrade.yml
@@ -6,8 +6,8 @@ jobs:
     env:
       OLD_INSTALL_DIR: postgres13
       NEW_INSTALL_DIR: postgres14
-      ENGINE_BRANCH_FROM: BABEL_1_X_DEV__PG_13_X
-      EXTENSION_BRANCH_FROM: BABEL_1_X_DEV
+      ENGINE_BRANCH_FROM: BABEL_1_5_STABLE__PG_13_9
+      EXTENSION_BRANCH_FROM: BABEL_1_5_STABLE
 
     runs-on: ubuntu-20.04
     steps:

diff --git a/contrib/babelfishpg_tds/Makefile b/contrib/babelfishpg_tds/Makefile
@@ -11,7 +11,7 @@ TSQL_SRC = ../babelfishpg_tsql
 
 PG_CFLAGS += -Werror -Wfloat-conversion
 PG_CFLAGS += -fstack-protector-strong
-PG_CPPFLAGS += -I$(TSQL_SRC) -I$(PG_SRC) -I$(tds_top_dir) -DFAULT_INJECTOR
+PG_CPPFLAGS += -I$(TSQL_SRC) -I$(PG_SRC) -I$(tds_top_dir)
 
 # Exclude the following files from the build (sometimes these
 # files are included in another c file)

diff --git a/test/JDBC/jdbc_schedule b/test/JDBC/jdbc_schedule
@@ -14,6 +14,10 @@ all
 ignore#!#insertbulk
 ignore#!#BABEL-SQLvariant
 
+#TDS fault injection framework is meant for internal testing only. So, ignore tds_faultinjection tests in stable branch
+ignore#!#tds_faultinjection
+ignore#!#babel_tds_fault_injection
+
 # Ignore upgrade tests in normal JDBC run. These are tests that cannot be run in non-upgrade contexts due
 # to changing the behavior between pre- and post-commit.
 ignore#!#BABEL-2934-vu-prepare
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		DEFAULT_BRANCH=BABEL_2_X_DEV__PG_14_X
		DEFAULT_BRANCH=BABEL_2_10_STABLE__PG_14_13