From af082571843a97c05463d4621ace2b9a969250a3 Mon Sep 17 00:00:00 2001
From: Walt Boettge <wboettge@amazon.com>
Date: Fri, 17 Nov 2023 15:02:06 -0600
Subject: [PATCH] [OSS ONLY] Finalize 3_4_STABLE (#2033)

Signed-off-by: Walt Boettge <wboettge@amazon.com>
---
 .github/scripts/clone_engine_repo.conf         | 2 +-
 .github/template/version-branch-template.yml   | 4 ++--
 .github/workflows/major-version-upgrade.yml    | 4 ++--
 .github/workflows/singledb-version-upgrade.yml | 4 ++--
 contrib/babelfishpg_tds/Makefile               | 2 +-
 test/JDBC/jdbc_schedule                        | 4 ++++
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/scripts/clone_engine_repo.conf b/.github/scripts/clone_engine_repo.conf
index c3dca81373b..f0b7d2f5ebb 100644
--- a/.github/scripts/clone_engine_repo.conf
+++ b/.github/scripts/clone_engine_repo.conf
@@ -1 +1 @@
-DEFAULT_BRANCH=BABEL_3_X_DEV__PG_15_X
+DEFAULT_BRANCH=BABEL_3_4_STABLE__PG_15_5
diff --git a/.github/template/version-branch-template.yml b/.github/template/version-branch-template.yml
index 9371c177e8d..0ff0f7e74f5 100644
--- a/.github/template/version-branch-template.yml
+++ b/.github/template/version-branch-template.yml
@@ -35,8 +35,8 @@
   engine_branch: BABEL_2_6_STABLE__PG_14_9
   extension_branch: BABEL_2_6_STABLE
 '14.10':
-  engine_branch: BABEL_2_X_DEV__PG_14_X
-  extension_branch: BABEL_2_X_DEV
+  engine_branch: BABEL_2_7_STABLE__PG_14_10
+  extension_branch: BABEL_2_7_STABLE
 '15.2':
   engine_branch: BABEL_3_1_STABLE__PG_15_2
   extension_branch: BABEL_3_1_STABLE
diff --git a/.github/workflows/major-version-upgrade.yml b/.github/workflows/major-version-upgrade.yml
index ed3deb3eaf7..704b12b608a 100644
--- a/.github/workflows/major-version-upgrade.yml
+++ b/.github/workflows/major-version-upgrade.yml
@@ -6,8 +6,8 @@ jobs:
     env:
       OLD_INSTALL_DIR: psql_source
       NEW_INSTALL_DIR: psql_target
-      ENGINE_BRANCH_FROM: BABEL_2_X_DEV__PG_14_X
-      EXTENSION_BRANCH_FROM: BABEL_2_X_DEV
+      ENGINE_BRANCH_FROM: BABEL_2_7_STABLE__PG_14_10
+      EXTENSION_BRANCH_FROM: BABEL_2_7_STABLE
 
     runs-on: ubuntu-20.04
     steps:
diff --git a/.github/workflows/singledb-version-upgrade.yml b/.github/workflows/singledb-version-upgrade.yml
index a980ffa9fb5..f7d7b0130d0 100644
--- a/.github/workflows/singledb-version-upgrade.yml
+++ b/.github/workflows/singledb-version-upgrade.yml
@@ -7,8 +7,8 @@ jobs:
       env:
       OLD_INSTALL_DIR: psql_source
       NEW_INSTALL_DIR: psql_target
-      ENGINE_BRANCH_FROM: BABEL_2_X_DEV__PG_14_X
-      EXTENSION_BRANCH_FROM: BABEL_2_X_DEV
+      ENGINE_BRANCH_FROM: BABEL_2_7_STABLE__PG_14_10
+      EXTENSION_BRANCH_FROM: BABEL_2_7_STABLE
 
     runs-on: ubuntu-20.04
     steps:
diff --git a/contrib/babelfishpg_tds/Makefile b/contrib/babelfishpg_tds/Makefile
index d734bfd2966..53dc10099a6 100644
--- 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
index 827dc396b2a..797c18906eb 100644
--- a/test/JDBC/jdbc_schedule
+++ b/test/JDBC/jdbc_schedule
@@ -16,6 +16,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