From 9e42d73dd2fd35910f140dbbf3ba27339a31a6f9 Mon Sep 17 00:00:00 2001 From: Sharu Goel Date: Wed, 23 Oct 2024 10:50:05 +0000 Subject: [PATCH] [OSS-ONLY] Finalize BABEL_4_4_STABLE This commit includes the following changes: - Disable TDS fault injection flag and tests - Update DEFAULT_BRANCH to point to stable branch - Update workflows to point to stable branch Signed-off-by: Sharu Goel --- .github/scripts/clone_engine_repo.conf | 2 +- .github/template/version-branch-template.yml | 8 ++++---- .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, 14 insertions(+), 10 deletions(-) diff --git a/.github/scripts/clone_engine_repo.conf b/.github/scripts/clone_engine_repo.conf index 024af54df9..f79ce46838 100644 --- a/.github/scripts/clone_engine_repo.conf +++ b/.github/scripts/clone_engine_repo.conf @@ -1 +1 @@ -DEFAULT_BRANCH=BABEL_4_X_DEV__PG_16_X +DEFAULT_BRANCH=BABEL_4_4_STABLE__PG_16_5 diff --git a/.github/template/version-branch-template.yml b/.github/template/version-branch-template.yml index 66033b31f6..676cf1d105 100644 --- a/.github/template/version-branch-template.yml +++ b/.github/template/version-branch-template.yml @@ -47,8 +47,8 @@ engine_branch: BABEL_2_10_STABLE__PG_14_13 extension_branch: BABEL_2_10_STABLE '14.14': - engine_branch: BABEL_2_X_DEV__PG_14_X - extension_branch: BABEL_2_X_DEV + engine_branch: BABEL_2_11_STABLE__PG_14_14 + extension_branch: BABEL_2_11_STABLE '15.2': engine_branch: BABEL_3_1_STABLE__PG_15_2 extension_branch: BABEL_3_1_STABLE @@ -71,8 +71,8 @@ engine_branch: BABEL_3_7_STABLE__PG_15_8 extension_branch: BABEL_3_7_STABLE '15.9': - engine_branch: BABEL_3_X_DEV__PG_15_X - extension_branch: BABEL_3_X_DEV + engine_branch: BABEL_3_8_STABLE__PG_15_9 + extension_branch: BABEL_3_8_STABLE '16.1': engine_branch: BABEL_4_0_STABLE__PG_16_1 extension_branch: BABEL_4_0_STABLE diff --git a/.github/workflows/major-version-upgrade.yml b/.github/workflows/major-version-upgrade.yml index 98aa5f27f8..5c50d66b0c 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_11_STABLE__PG_14_14 + EXTENSION_BRANCH_FROM: BABEL_2_11_STABLE runs-on: ubuntu-20.04 steps: diff --git a/.github/workflows/singledb-version-upgrade.yml b/.github/workflows/singledb-version-upgrade.yml index a35d90dc18..eebc7a4a64 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_11_STABLE__PG_14_14 + EXTENSION_BRANCH_FROM: BABEL_2_11_STABLE runs-on: ubuntu-20.04 steps: diff --git a/contrib/babelfishpg_tds/Makefile b/contrib/babelfishpg_tds/Makefile index d734bfd296..53dc10099a 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 6630488bd1..c98455fce3 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