Skip to content

Commit d687865

Browse files
[OSS-ONLY] Finalize BABEL_2_16_STABLE (#4414)
Finalize BABEL_2_16_STABLE branch: Update DEFAULT_BRANCH to point to stable branch. Update workflows to point to stable branch. Disabling TDS fault injection framework Signed-off-by: Shameem Ahmed shmeeh@amazon.com
1 parent 30a1a41 commit d687865

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
DEFAULT_BRANCH=BABEL_2_X_DEV__PG_14_X
1+
DEFAULT_BRANCH=BABEL_2_16_STABLE__PG_14_21

.github/workflows/major-version-upgrade.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ jobs:
66
env:
77
OLD_INSTALL_DIR: postgres13
88
NEW_INSTALL_DIR: postgres14
9-
ENGINE_BRANCH_FROM: BABEL_1_X_DEV__PG_13_X
10-
EXTENSION_BRANCH_FROM: BABEL_1_X_DEV
9+
ENGINE_BRANCH_FROM: BABEL_1_5_STABLE__PG_13_9
10+
EXTENSION_BRANCH_FROM: BABEL_1_5_STABLE
1111

1212
runs-on: ubuntu-22.04
1313
steps:

contrib/babelfishpg_tds/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ TSQL_SRC = ../babelfishpg_tsql
1111

1212
PG_CFLAGS += -Werror -Wfloat-conversion
1313
PG_CFLAGS += -fstack-protector-strong
14-
PG_CPPFLAGS += -I$(TSQL_SRC) -I$(PG_SRC) -I$(tds_top_dir) -DFAULT_INJECTOR
14+
PG_CPPFLAGS += -I$(TSQL_SRC) -I$(PG_SRC) -I$(tds_top_dir)
1515

1616
# Exclude the following files from the build (sometimes these
1717
# files are included in another c file)

test/JDBC/jdbc_schedule

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,3 +202,7 @@ ignore#!#ISC-Tables-before_16_4_or_15_8_or_14_13-vu-cleanup
202202
ignore#!#babelfish_function_ext-before_16_4_or_15_8_or_14_13-vu-prepare
203203
ignore#!#babelfish_function_ext-before_16_4_or_15_8_or_14_13-vu-verify
204204
ignore#!#babelfish_function_ext-before_16_4_or_15_8_or_14_13-vu-cleanup
205+
206+
#TDS fault injection framework is meant for internal testing only. So, ignore tds_faultinjection tests in stable branch
207+
ignore#!#tds_faultinjection
208+
ignore#!#babel_tds_fault_injection

0 commit comments

Comments
 (0)