[OSS-ONLY] Update version and upgrade-test-configuration (#3152)

* Update versions from 14.14 to 14.15 in upgrade-test-configuration. * Rename 14_14/schedule file to 14_15/schedule. * Bump Babelfish internal version from 14.15 to 14.16. * Also update github actions to use fixed version of pymssql as newer version has dependency issue. Task: OSS-ONLY Signed-off-by: Rishabh Tanwar <[email protected]>
babelfish-for-postgresql · Nov 22, 2024 · f7c855b · f7c855b
1 parent 73af627
commit f7c855b
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/.github/composite-actions/install-dependencies/action.yml b/.github/composite-actions/install-dependencies/action.yml
@@ -8,5 +8,5 @@ runs:
         sudo apt clean && sudo apt-get update --fix-missing -y
         curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
         curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list | sudo tee /etc/apt/sources.list.d/msprod.list
-        sudo apt-get install uuid-dev openjdk-8-jre libicu-dev libxml2-dev openssl libssl-dev python-dev libossp-uuid-dev libpq-dev cmake pkg-config g++ build-essential bison mssql-tools unixodbc-dev
+        sudo apt-get install uuid-dev openjdk-8-jre libicu-dev libxml2-dev openssl libssl-dev python-dev libossp-uuid-dev libpq-dev cmake pkg-config g++ build-essential bison mssql-tools unixodbc-dev libkrb5-dev
       shell: bash
diff --git a/.github/composite-actions/setup-base-version/action.yml b/.github/composite-actions/setup-base-version/action.yml
@@ -139,7 +139,7 @@ runs:
       run: |
         cd ~
         sudo apt-get install odbc-postgresql
-        pip3 install pyodbc==4.0.35 pymssql
+        pip3 install pyodbc==4.0.35 pymssql==2.2.7
       shell: bash
 
     - name: Run dependency check

diff --git a/.github/configuration/upgrade-test-configuration.yml b/.github/configuration/upgrade-test-configuration.yml
@@ -61,7 +61,7 @@ upgrade-version: [{
 {
   upgrade-path: [
     {
-      version: '14.14',
+      version: '14.15',
       upgrade-type: null
     },
     {

diff --git a/.github/template/version-branch-template.yml b/.github/template/version-branch-template.yml
@@ -43,8 +43,8 @@
 '14.13':
   engine_branch: BABEL_2_10_STABLE__PG_14_13
   extension_branch: BABEL_2_10_STABLE
-'14.14':
-  engine_branch: BABEL_2_11_STABLE__PG_14_14
+'14.15':
+  engine_branch: BABEL_2_11_STABLE__PG_14_15
   extension_branch: BABEL_2_11_STABLE
 'source.latest':
   engine_branch: latest

diff --git a/.github/workflows/isolation-tests.yml b/.github/workflows/isolation-tests.yml
@@ -49,7 +49,7 @@ jobs:
           curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
           cd ~/work/babelfish_extensions/babelfish_extensions/test/python
           sudo ACCEPT_EULA=Y apt-get install -y msodbcsql17 python3-dev
-          pip3 install pyodbc pymssql pytest pytest-xdist antlr4-python3-runtime==4.9.3
+          pip3 install pyodbc pymssql==2.2.7 pytest pytest-xdist antlr4-python3-runtime==4.9.3
       
       - name: Generate .spec file parser
         run: |

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
@@ -52,7 +52,7 @@ jobs:
           wget https://github.com/microsoft/sqltoolsservice/releases/download/4.4.0.12/Microsoft.SqlTools.ServiceLayer-rhel-x64-net6.0.tar.gz && tar -xzvf Microsoft.SqlTools.ServiceLayer-rhel-x64-net6.0.tar.gz
           cd ../
           sudo ACCEPT_EULA=Y apt-get install -y msodbcsql17 python3-dev
-          pip3 install pyodbc==4.0.35 pymssql pytest pytest-xdist
+          pip3 install pyodbc pymssql==2.2.7 pytest pytest-xdist
       
       - name: Run Python Tests
         if: always() && steps.configure-python-environment.outcome == 'success'

diff --git a/contrib/babelfishpg_tsql/src/babelfish_version.h b/contrib/babelfishpg_tsql/src/babelfish_version.h
@@ -9,6 +9,6 @@
  */
 
 #define BABELFISH_VERSION_STR "2.12.0"
-#define BABELFISH_INTERNAL_VERSION_STR "Babelfish 14.15.0.0"
+#define BABELFISH_INTERNAL_VERSION_STR "Babelfish 14.16.0.0"
 #define BABEL_COMPATIBILITY_VERSION "12.0.2000.8"
 #define BABEL_COMPATIBILITY_MAJOR_VERSION "12"
diff --git a/test/JDBC/upgrade/14_14/schedule → test/JDBC/upgrade/14_15/schedule b/test/JDBC/upgrade/14_14/schedule → test/JDBC/upgrade/14_15/schedule