[OSS ONLY] Finalize 3_4_STABLE (#2033)

Signed-off-by: Walt Boettge <[email protected]>
babelfish-for-postgresql · Nov 17, 2023 · af08257 · af08257
1 parent c8cc9a4
commit af08257
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		DEFAULT_BRANCH=BABEL_3_X_DEV__PG_15_X
		DEFAULT_BRANCH=BABEL_3_4_STABLE__PG_15_5