From 83e3fb817de8fc93c4819808b0dc8925c2bb6d38 Mon Sep 17 00:00:00 2001
From: Jelte Fennema-Nio <jelte.fennema@microsoft.com>
Date: Tue, 31 Oct 2023 14:05:09 +0100
Subject: [PATCH 1/4] Only put major Postgres version in CI task name (#7289)

Making tasks in CI required before merging to master is important and
useful. The way this works is by saving the exact names of the required
tasks in the admin interface of the repo. It has a search box to add
them so it's not completely horrible, but doing so is quite a hassle
since we have so many jobs. So limiting the amount of churn in this list
of required jobs is quite useful.

This changes the names of tasks to only include the major versions of
Postgres, not the minor ones. Otherwise the next time we bump the minor
versions we would have to remove and re-add each of the jobs.
---
 .github/workflows/build_and_test.yml          | 26 +++++++++----------
 .../workflows/packaging-test-pipelines.yml    |  8 +++---
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 1f22ff034..5f087fc08 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -27,9 +27,9 @@ jobs:
       style_checker_image_name: "citus/stylechecker"
       style_checker_tools_version: "0.8.18"
       image_suffix: "-v9d71045"
-      pg14_version: "14.9"
-      pg15_version: "15.4"
-      pg16_version: "16.0"
+      pg14_version: '{ "major": "14", "full": "14.9" }'
+      pg15_version: '{ "major": "15", "full": "15.4" }'
+      pg16_version: '{ "major": "16", "full": "16.0" }'
       upgrade_pg_versions: "14.9-15.4-16.0"
     steps:
       # Since GHA jobs needs at least one step we use a noop step here.
@@ -93,7 +93,7 @@ jobs:
       run: ci/check_migration_files.sh
   build:
     needs: params
-    name: Build for PG ${{ matrix.pg_version}}
+    name: Build for PG${{ fromJson(matrix.pg_version).major }}
     strategy:
       fail-fast: false
       matrix:
@@ -107,7 +107,7 @@ jobs:
           - ${{ needs.params.outputs.pg16_version }}
     runs-on: ubuntu-20.04
     container:
-      image: "${{ matrix.image_name }}:${{ matrix.pg_version  }}${{ matrix.image_suffix }}"
+      image: "${{ matrix.image_name }}:${{ fromJson(matrix.pg_version).full }}${{ matrix.image_suffix }}"
       options: --user root
     steps:
     - uses: actions/checkout@v3.5.0
@@ -124,7 +124,7 @@ jobs:
           ./build-${{ env.PG_MAJOR }}/*
           ./install-${{ env.PG_MAJOR }}.tar
   test-citus:
-    name: PG${{ matrix.pg_version }} - ${{ matrix.make }}
+    name: PG${{ fromJson(matrix.pg_version).major }} - ${{ matrix.make }}
     strategy:
       fail-fast: false
       matrix:
@@ -211,7 +211,7 @@ jobs:
             image_name: ${{ needs.params.outputs.fail_test_image_name }}
     runs-on: ubuntu-20.04
     container:
-      image: "${{ matrix.image_name }}:${{ matrix.pg_version }}${{ needs.params.outputs.image_suffix }}"
+      image: "${{ matrix.image_name }}:${{ fromJson(matrix.pg_version).full }}${{ needs.params.outputs.image_suffix }}"
       options: --user root --dns=8.8.8.8
       # Due to Github creates a default network for each job, we need to use
       # --dns= to have similar DNS settings as our other CI systems or local
@@ -228,17 +228,17 @@ jobs:
     - uses: "./.github/actions/save_logs_and_results"
       if: always()
       with:
-        folder: ${{ matrix.pg_version }}_${{ matrix.make }}
+        folder: ${{ fromJson(matrix.pg_version).major }}_${{ matrix.make }}
     - uses: "./.github/actions/upload_coverage"
       if: always()
       with:
         flags: ${{ env.PG_MAJOR }}_${{ matrix.suite }}_${{ matrix.make }}
         codecov_token: ${{ secrets.CODECOV_TOKEN }}
   test-arbitrary-configs:
-    name: PG${{ matrix.pg_version }} - check-arbitrary-configs-${{ matrix.parallel }}
+    name: PG${{ fromJson(matrix.pg_version).major }} - check-arbitrary-configs-${{ matrix.parallel }}
     runs-on: ["self-hosted", "1ES.Pool=1es-gha-citusdata-pool"]
     container:
-      image: "${{ matrix.image_name }}:${{ matrix.pg_version }}${{ needs.params.outputs.image_suffix }}"
+      image: "${{ matrix.image_name }}:${{ fromJson(matrix.pg_version).full }}${{ needs.params.outputs.image_suffix }}"
       options: --user root
     needs:
       - params
@@ -333,10 +333,10 @@ jobs:
         flags: ${{ env.old_pg_major }}_${{ env.new_pg_major }}_upgrade
         codecov_token: ${{ secrets.CODECOV_TOKEN }}
   test-citus-upgrade:
-    name: PG${{ needs.params.outputs.pg14_version }} - check-citus-upgrade
+    name: PG${{ fromJson(needs.params.outputs.pg14_version).major }} - check-citus-upgrade
     runs-on: ubuntu-20.04
     container:
-      image: "${{ needs.params.outputs.citusupgrade_image_name }}:${{ needs.params.outputs.pg14_version }}${{ needs.params.outputs.image_suffix }}"
+      image: "${{ needs.params.outputs.citusupgrade_image_name }}:${{ fromJson(needs.params.outputs.pg14_version).full }}${{ needs.params.outputs.image_suffix }}"
       options: --user root
     needs:
     - params
@@ -383,7 +383,7 @@ jobs:
       CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
     runs-on: ubuntu-20.04
     container:
-      image: ${{ needs.params.outputs.test_image_name }}:${{ needs.params.outputs.pg16_version }}${{ needs.params.outputs.image_suffix }}
+      image: ${{ needs.params.outputs.test_image_name }}:${{ fromJson(needs.params.outputs.pg16_version).full }}${{ needs.params.outputs.image_suffix }}
     needs:
       - params
       - test-citus
diff --git a/.github/workflows/packaging-test-pipelines.yml b/.github/workflows/packaging-test-pipelines.yml
index 0fb4b7092..8690fce1f 100644
--- a/.github/workflows/packaging-test-pipelines.yml
+++ b/.github/workflows/packaging-test-pipelines.yml
@@ -24,9 +24,11 @@ jobs:
       - name: Get Postgres Versions
         id: get-postgres-versions
         run: |
-          # Postgres versions are stored in .github/workflows/build_and_test.yml file in "pg[pg-version]_version"
-          # format. Below command extracts the versions and get the unique values.
-          pg_versions=$(cat .github/workflows/build_and_test.yml | grep -oE 'pg[0-9]+_version: "[0-9.]+"' | sed -E 's/pg([0-9]+)_version: "([0-9.]+)"/\1/g' | sort | uniq | tr '\n', ',')
+          set -euxo pipefail
+          # Postgres versions are stored in .github/workflows/build_and_test.yml
+          # file in json strings with major and full keys.
+          # Below command extracts the versions and get the unique values.
+          pg_versions=$(cat .github/workflows/build_and_test.yml | grep -oE '"major": "[0-9]+", "full": "[0-9.]+"' | sed -E 's/"major": "([0-9]+)", "full": "([0-9.]+)"/\1/g' | sort | uniq | tr '\n', ',')
           pg_versions_array="[ ${pg_versions} ]"
           echo "Supported PG Versions: ${pg_versions_array}"
           # Below line is needed to set the output variable to be used in the next job

From ce58c043049ad4fdbc2971cfda8e168d0b3d4a55 Mon Sep 17 00:00:00 2001
From: Gokhan Gulbiz <ggulbiz@gmail.com>
Date: Tue, 31 Oct 2023 18:00:10 +0300
Subject: [PATCH 2/4] Disable CircleCI (#7276)

We are switching to Github Actions. In the test period it has worked well enough, so now we can stop using CircleCI.
---
 .circleci/config.yml               | 1128 ----------------------------
 ci/check_all_ci_scripts_are_run.sh |    4 +-
 ci/check_enterprise_merge.sh       |   96 ---
 3 files changed, 2 insertions(+), 1226 deletions(-)
 delete mode 100644 .circleci/config.yml
 delete mode 100755 ci/check_enterprise_merge.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index 376c44331..000000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,1128 +0,0 @@
-version: 2.1
-orbs:
-  codecov: codecov/codecov@1.1.1
-  azure-cli: circleci/azure-cli@1.0.0
-
-parameters:
-  image_suffix:
-    type: string
-    default: '-v9d71045'
-  pg14_version:
-    type: string
-    default: '14.9'
-  pg15_version:
-    type: string
-    default: '15.4'
-  pg16_version:
-    type: string
-    default: '16.0'
-  upgrade_pg_versions:
-    type: string
-    default: '14.9-15.4-16.0'
-  style_checker_tools_version:
-    type: string
-    default: '0.8.18'
-  flaky_test:
-    type: string
-    default: ''
-  flaky_test_runs_per_job:
-    type: integer
-    default: 50
-  skip_flaky_tests:
-    type: boolean
-    default: false
-
-commands:
-  install_extension:
-    parameters:
-      pg_major:
-        description: 'postgres major version to use'
-        type: integer
-    steps:
-      - run:
-          name: 'Install Extension'
-          command: |
-            tar xfv "${CIRCLE_WORKING_DIRECTORY}/install-<< parameters.pg_major >>.tar" --directory /
-
-  configure:
-    steps:
-      - run:
-          name: 'Configure'
-          command: |
-            chown -R circleci .
-            gosu circleci ./configure --without-pg-version-check
-
-  enable_core:
-    steps:
-      - run:
-          name: 'Enable core dumps'
-          command: |
-            ulimit -c unlimited
-
-  save_regressions:
-    steps:
-      - run:
-          name: 'Regressions'
-          command: |
-            if [ -f "src/test/regress/regression.diffs" ]; then
-              cat src/test/regress/regression.diffs
-              exit 1
-            fi
-          when: on_fail
-      - store_artifacts:
-          name: 'Save regressions'
-          path: src/test/regress/regression.diffs
-
-  save_logs_and_results:
-    steps:
-      - store_artifacts:
-          name: 'Save mitmproxy output (failure test specific)'
-          path: src/test/regress/proxy.output
-      - store_artifacts:
-          name: 'Save results'
-          path: src/test/regress/results/
-      - store_artifacts:
-          name: 'Save coordinator log'
-          path: src/test/regress/tmp_check/master/log
-      - store_artifacts:
-          name: 'Save worker1 log'
-          path: src/test/regress/tmp_check/worker.57637/log
-      - store_artifacts:
-          name: 'Save worker2 log'
-          path: src/test/regress/tmp_check/worker.57638/log
-
-  stack_trace:
-    steps:
-      - run:
-          name: 'Print stack traces'
-          command: |
-            ./ci/print_stack_trace.sh
-          when: on_fail
-
-  coverage:
-    parameters:
-      flags:
-        description: 'codecov flags'
-        type: string
-    steps:
-    - codecov/upload:
-        flags: '<< parameters.flags >>'
-    - run:
-        name: 'Create codeclimate coverage'
-        command: |
-          lcov --directory . --capture --output-file lcov.info
-          lcov --remove lcov.info -o lcov.info '/usr/*'
-          sed "s=^SF:$PWD/=SF:=g" -i lcov.info # relative pats are required by codeclimate
-          mkdir -p /tmp/codeclimate
-          # We started getting permissions error. This fixes them and since
-          # weqre not on a multi-user system so this is safe to do.
-          git config --global --add safe.directory /home/circleci/project
-          cc-test-reporter format-coverage -t lcov -o /tmp/codeclimate/$CIRCLE_JOB.json lcov.info
-    - persist_to_workspace:
-        root: /tmp
-        paths:
-          - codeclimate/*.json
-
-jobs:
-  build:
-    description: Build the citus extension
-    parameters:
-      pg_major:
-        description: postgres major version building citus for
-        type: integer
-      image:
-        description: docker image to use for the build
-        type: string
-        default: citus/extbuilder
-      image_tag:
-        description: tag to use for the docker image
-        type: string
-    docker:
-      - image: '<< parameters.image >>:<< parameters.image_tag >><< pipeline.parameters.image_suffix >>'
-    steps:
-      - checkout
-      - run:
-          name: 'Configure, Build, and Install'
-          command: |
-            ./ci/build-citus.sh
-      - persist_to_workspace:
-          root: .
-          paths:
-            - build-<< parameters.pg_major >>/*
-            - install-<<parameters.pg_major >>.tar
-
-  check-style:
-    docker:
-      - image: 'citus/stylechecker:<< pipeline.parameters.style_checker_tools_version >><< pipeline.parameters.image_suffix >>'
-    steps:
-      - checkout
-      - run:
-          name: 'Check C Style'
-          command: citus_indent --check
-      - run:
-          name: 'Check Python style'
-          command: black --check .
-      - run:
-          name: 'Check Python import order'
-          command: isort --check .
-      - run:
-          name: 'Check Python lints'
-          command: flake8 .
-      - run:
-          name: 'Fix whitespace'
-          command: ci/editorconfig.sh && git diff --exit-code
-      - run:
-          name: 'Remove useless declarations'
-          command: ci/remove_useless_declarations.sh && git diff --cached --exit-code
-      - run:
-          name: 'Normalize test output'
-          command: ci/normalize_expected.sh && git diff --exit-code
-      - run:
-          name: 'Check for C-style comments in migration files'
-          command: ci/disallow_c_comments_in_migrations.sh && git diff --exit-code
-      - run:
-          name: 'Check for comment--cached ns that start with # character in spec files'
-          command: ci/disallow_hash_comments_in_spec_files.sh && git diff --exit-code
-      - run:
-          name: 'Check for gitignore entries .for source files'
-          command: ci/fix_gitignore.sh && git diff --exit-code
-      - run:
-          name: 'Check for lengths of changelog entries'
-          command: ci/disallow_long_changelog_entries.sh
-      - run:
-          name: 'Check for banned C API usage'
-          command: ci/banned.h.sh
-      - run:
-          name: 'Check for tests missing in schedules'
-          command: ci/check_all_tests_are_run.sh
-      - run:
-          name: 'Check if all CI scripts are actually run'
-          command: ci/check_all_ci_scripts_are_run.sh
-      - run:
-          name: 'Check if all GUCs are sorted alphabetically'
-          command: ci/check_gucs_are_alphabetically_sorted.sh
-      - run:
-          name: 'Check for missing downgrade scripts'
-          command: ci/check_migration_files.sh
-
-  check-sql-snapshots:
-    docker:
-      - image: 'citus/extbuilder:latest'
-    steps:
-      - checkout
-      - run:
-          name: 'Check Snapshots'
-          command: ci/check_sql_snapshots.sh
-
-  test-pg-upgrade:
-    description: Runs postgres upgrade tests
-    parameters:
-      old_pg_major:
-        description: 'postgres major version to use before the upgrade'
-        type: integer
-      new_pg_major:
-        description: 'postgres major version to upgrade to'
-        type: integer
-      image:
-        description: 'docker image to use as for the tests'
-        type: string
-        default: citus/pgupgradetester
-      image_tag:
-        description: 'docker image tag to use'
-        type: string
-    docker:
-      - image: '<< parameters.image >>:<< parameters.image_tag >><< pipeline.parameters.image_suffix >>'
-    working_directory: /home/circleci/project
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - install_extension:
-          pg_major: << parameters.old_pg_major >>
-      - install_extension:
-          pg_major: << parameters.new_pg_major >>
-      - configure
-      - enable_core
-      - run:
-          name: 'Install and test postgres upgrade'
-          command: |
-            gosu circleci \
-              make -C src/test/regress \
-                check-pg-upgrade \
-                old-bindir=/usr/lib/postgresql/<< parameters.old_pg_major >>/bin \
-                new-bindir=/usr/lib/postgresql/<< parameters.new_pg_major >>/bin
-          no_output_timeout: 2m
-      - run:
-          name: 'Copy pg_upgrade logs for newData dir'
-          command: |
-            mkdir -p /tmp/pg_upgrade_newData_logs
-            if ls src/test/regress/tmp_upgrade/newData/*.log 1> /dev/null 2>&1; then
-                cp src/test/regress/tmp_upgrade/newData/*.log /tmp/pg_upgrade_newData_logs
-            fi
-          when: on_fail
-      - store_artifacts:
-          name: 'Save pg_upgrade logs for newData dir'
-          path: /tmp/pg_upgrade_newData_logs
-      - save_logs_and_results
-      - save_regressions
-      - stack_trace
-      - coverage:
-          flags: 'test_<< parameters.old_pg_major >>_<< parameters.new_pg_major >>,upgrade'
-
-  test-pytest:
-    description: Runs pytest based tests
-    parameters:
-      pg_major:
-        description: 'postgres major version'
-        type: integer
-      image:
-        description: 'docker image to use as for the tests'
-        type: string
-        default: citus/failtester
-      image_tag:
-        description: 'docker image tag to use'
-        type: string
-    docker:
-      - image: '<< parameters.image >>:<< parameters.image_tag >><< pipeline.parameters.image_suffix >>'
-    working_directory: /home/circleci/project
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - install_extension:
-          pg_major: << parameters.pg_major >>
-      - configure
-      - enable_core
-      - run:
-          name: 'Run pytest'
-          command: |
-            gosu circleci \
-              make -C src/test/regress check-pytest
-          no_output_timeout: 2m
-      - stack_trace
-      - coverage:
-          flags: 'test_<< parameters.pg_major >>,pytest'
-
-
-  test-arbitrary-configs:
-    description: Runs tests on arbitrary configs
-    parallelism: 6
-    parameters:
-      pg_major:
-        description: 'postgres major version to use'
-        type: integer
-      image:
-        description: 'docker image to use as for the tests'
-        type: string
-        default: citus/failtester
-      image_tag:
-        description: 'docker image tag to use'
-        type: string
-    docker:
-      - image: '<< parameters.image >>:<< parameters.image_tag >><< pipeline.parameters.image_suffix >>'
-    resource_class: xlarge
-    working_directory: /home/circleci/project
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - install_extension:
-          pg_major: << parameters.pg_major >>
-      - configure
-      - enable_core
-      - run:
-          name: 'Test arbitrary configs'
-          command: |
-            TESTS=$(src/test/regress/citus_tests/print_test_names.py | circleci tests split)
-            # Our test suite expects comma separated values
-            TESTS=$(echo $TESTS | tr ' ' ',')
-            # TESTS will contain subset of configs that will be run on a container and we use multiple containers
-            # to run the test suite
-            gosu circleci \
-              make -C src/test/regress \
-                check-arbitrary-configs parallel=4 CONFIGS=$TESTS
-          no_output_timeout: 2m
-      - run:
-          name: 'Show regressions'
-          command: |
-            find src/test/regress/tmp_citus_test/ -name "regression*.diffs" -exec cat {} +
-            lines=$(find src/test/regress/tmp_citus_test/ -name "regression*.diffs" | wc -l)
-            if [ $lines -ne 0 ]; then
-               exit 1
-            fi
-
-          when: on_fail
-      - run:
-          name: 'Copy logfiles'
-          command: |
-            mkdir src/test/regress/tmp_citus_test/logfiles
-            find src/test/regress/tmp_citus_test/ -name "logfile_*" -exec cp -t src/test/regress/tmp_citus_test/logfiles/ {} +
-          when: on_fail
-      - store_artifacts:
-          name: 'Save logfiles'
-          path: src/test/regress/tmp_citus_test/logfiles
-      - save_logs_and_results
-      - stack_trace
-      - coverage:
-          flags: 'test_<< parameters.pg_major >>,upgrade'
-
-  test-citus-upgrade:
-    description: Runs citus upgrade tests
-    parameters:
-      pg_major:
-        description: 'postgres major version'
-        type: integer
-      image:
-        description: 'docker image to use as for the tests'
-        type: string
-        default: citus/citusupgradetester
-      image_tag:
-        description: 'docker image tag to use'
-        type: string
-    docker:
-      - image: '<< parameters.image >>:<< parameters.image_tag >><< pipeline.parameters.image_suffix >>'
-    working_directory: /home/circleci/project
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - configure
-      - enable_core
-      - run:
-          name: 'Install and test citus upgrade'
-          command: |
-            # run make check-citus-upgrade for all citus versions
-            # the image has ${CITUS_VERSIONS} set with all verions it contains the binaries of
-            for citus_version in ${CITUS_VERSIONS}; do \
-              gosu circleci \
-                make -C src/test/regress \
-                  check-citus-upgrade \
-                  bindir=/usr/lib/postgresql/${PG_MAJOR}/bin \
-                  citus-old-version=${citus_version} \
-                  citus-pre-tar=/install-pg${PG_MAJOR}-citus${citus_version}.tar \
-                  citus-post-tar=/home/circleci/project/install-$PG_MAJOR.tar; \
-            done;
-
-            # run make check-citus-upgrade-mixed for all citus versions
-            # the image has ${CITUS_VERSIONS} set with all verions it contains the binaries of
-            for citus_version in ${CITUS_VERSIONS}; do \
-              gosu circleci \
-                make -C src/test/regress \
-                  check-citus-upgrade-mixed \
-                  citus-old-version=${citus_version} \
-                  bindir=/usr/lib/postgresql/${PG_MAJOR}/bin \
-                  citus-pre-tar=/install-pg${PG_MAJOR}-citus${citus_version}.tar \
-                  citus-post-tar=/home/circleci/project/install-$PG_MAJOR.tar; \
-            done;
-          no_output_timeout: 2m
-      - save_logs_and_results
-      - save_regressions
-      - stack_trace
-      - coverage:
-          flags: 'test_<< parameters.pg_major >>,upgrade'
-
-  test-query-generator:
-    description: Expects that the generated queries that are run on distributed and local tables would have the same results
-    parameters:
-      pg_major:
-        description: 'postgres major version'
-        type: integer
-      image:
-        description: 'docker image to use as for the tests'
-        type: string
-        default: citus/failtester
-      image_tag:
-        description: 'docker image tag to use'
-        type: string
-    docker:
-      - image: '<< parameters.image >>:<< parameters.image_tag >><< pipeline.parameters.image_suffix >>'
-    working_directory: /home/circleci/project
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - install_extension:
-          pg_major: << parameters.pg_major >>
-      - configure
-      - enable_core
-      - run:
-          name: 'Run Test'
-          command: |
-            gosu circleci make -C src/test/regress check-query-generator
-          no_output_timeout: 5m
-      - run:
-          name: 'Show regressions'
-          command: |
-            find src/test/regress/citus_tests/query_generator/out/ -name "local_dist.diffs" -exec cat {} +
-            lines=$(find src/test/regress/citus_tests/query_generator/out/ -name "local_dist.diffs" | wc -l)
-            if [ $lines -ne 0 ]; then
-               exit 1
-            fi
-          when: on_fail
-      - run:
-          name: 'Copy logfiles'
-          command: |
-            mkdir src/test/regress/tmp_citus_test/logfiles
-            find src/test/regress/tmp_citus_test/ -name "logfile_*" -exec cp -t src/test/regress/tmp_citus_test/logfiles/ {} +
-          when: on_fail
-      - store_artifacts:
-          name: 'Save logfiles'
-          path: src/test/regress/tmp_citus_test/logfiles
-      - store_artifacts:
-          name: 'Save ddls'
-          path: src/test/regress/citus_tests/query_generator/out/ddls.sql
-      - store_artifacts:
-          name: 'Save dmls'
-          path: src/test/regress/citus_tests/query_generator/out/queries.sql
-      - store_artifacts:
-          name: 'Save diffs'
-          path: src/test/regress/citus_tests/query_generator/out/local_dist.diffs
-      - stack_trace
-      - coverage:
-          flags: 'test_<< parameters.pg_major >>,querygen'
-
-  test-citus:
-    description: Runs the common tests of citus
-    parameters:
-      pg_major:
-        description: 'postgres major version'
-        type: integer
-      image:
-        description: 'docker image to use as for the tests'
-        type: string
-        default: citus/exttester
-      image_tag:
-        description: 'docker image tag to use'
-        type: string
-      make:
-        description: 'make target'
-        type: string
-    docker:
-      - image: '<< parameters.image >>:<< parameters.image_tag >><< pipeline.parameters.image_suffix >>'
-    working_directory: /home/circleci/project
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - install_extension:
-          pg_major: << parameters.pg_major >>
-      - configure
-      - enable_core
-      - run:
-          name: 'Run Test'
-          command: |
-            gosu circleci make -C src/test/regress << parameters.make >>
-          no_output_timeout: 2m
-      - save_logs_and_results
-      - save_regressions
-      - stack_trace
-      - coverage:
-          flags: 'test_<< parameters.pg_major >>,<< parameters.make >>'
-
-  tap-test-citus:
-    description: Runs tap tests for citus
-    parameters:
-      pg_major:
-        description: 'postgres major version'
-        type: integer
-      image:
-        description: 'docker image to use as for the tests'
-        type: string
-        default: citus/exttester
-      image_tag:
-        description: 'docker image tag to use'
-        type: string
-      suite:
-        description: 'name of the tap test suite to run'
-        type: string
-      make:
-        description: 'make target'
-        type: string
-        default: installcheck
-    docker:
-      - image: '<< parameters.image >>:<< parameters.image_tag >><< pipeline.parameters.image_suffix >>'
-    working_directory: /home/circleci/project
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - install_extension:
-          pg_major: << parameters.pg_major >>
-      - configure
-      - enable_core
-      - run:
-          name: 'Run Test'
-          command: |
-            gosu circleci make -C src/test/<< parameters.suite >> << parameters.make >>
-          no_output_timeout: 2m
-      - store_artifacts:
-          name: 'Save tap logs'
-          path: /home/circleci/project/src/test/<< parameters.suite >>/tmp_check/log
-      - save_logs_and_results
-      - stack_trace
-      - coverage:
-          flags: 'test_<< parameters.pg_major >>,tap_<< parameters.suite >>_<< parameters.make >>'
-
-  check-merge-to-enterprise:
-    docker:
-      - image: citus/extbuilder:<< pipeline.parameters.pg14_version >>
-    working_directory: /home/circleci/project
-    steps:
-      - checkout
-      - run:
-          command: |
-            ci/check_enterprise_merge.sh
-
-  ch_benchmark:
-    docker:
-      - image: buildpack-deps:stretch
-    working_directory: /home/circleci/project
-    steps:
-      - checkout
-      - azure-cli/install
-      - azure-cli/login-with-service-principal
-      - run:
-          command: |
-            cd ./src/test/hammerdb
-            sh run_hammerdb.sh citusbot_ch_benchmark_rg
-          name: install dependencies and run ch_benchmark tests
-          no_output_timeout: 20m
-
-  tpcc_benchmark:
-    docker:
-      - image: buildpack-deps:stretch
-    working_directory: /home/circleci/project
-    steps:
-      - checkout
-      - azure-cli/install
-      - azure-cli/login-with-service-principal
-      - run:
-          command: |
-            cd ./src/test/hammerdb
-            sh run_hammerdb.sh citusbot_tpcc_benchmark_rg
-          name: install dependencies and run ch_benchmark tests
-          no_output_timeout: 20m
-
-  test-flakyness:
-    description: Runs a test multiple times to see if it's flaky
-    parallelism: 32
-    parameters:
-      pg_major:
-        description: 'postgres major version'
-        type: integer
-      image:
-        description: 'docker image to use as for the tests'
-        type: string
-        default: citus/failtester
-      image_tag:
-        description: 'docker image tag to use'
-        type: string
-      test:
-        description: 'the test file path that should be run multiple times'
-        type: string
-        default: ''
-      runs:
-        description: 'number of times that the test should be run in total'
-        type: integer
-        default: 8
-      skip:
-        description: 'A flag to bypass flaky test detection.'
-        type: boolean
-        default: false
-    docker:
-      - image: '<< parameters.image >>:<< parameters.image_tag >><< pipeline.parameters.image_suffix >>'
-    working_directory: /home/circleci/project
-    resource_class: small
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: 'Detect regression tests need to be ran'
-          command: |
-            skip=<< parameters.skip >>
-            if [ "$skip" = true ]; then
-                echo "Skipping flaky test detection."
-                circleci-agent step halt
-            fi
-
-            testForDebugging="<< parameters.test >>"
-
-            if [ -z "$testForDebugging" ]; then
-              detected_changes=$(git diff origin/main... --name-only --diff-filter=AM | (grep 'src/test/regress/sql/.*\.sql\|src/test/regress/spec/.*\.spec\|src/test/regress/citus_tests/test/test_.*\.py' || true))
-              tests=${detected_changes}
-            else
-              tests=$testForDebugging;
-            fi
-
-            if [ -z "$tests" ]; then
-                echo "No test found."
-                circleci-agent step halt
-            else
-              echo "Detected tests " $tests
-            fi
-
-            echo export tests=\""$tests"\" >> "$BASH_ENV"
-            source "$BASH_ENV"
-      - install_extension:
-          pg_major: << parameters.pg_major >>
-      - configure
-      - enable_core
-      - run:
-          name: 'Run minimal tests'
-          command: |
-            tests_array=($tests)
-            for test in "${tests_array[@]}"
-            do
-                test_name=$(echo "$test" | sed -r "s/.+\/(.+)\..+/\1/")
-                gosu circleci src/test/regress/citus_tests/run_test.py $test_name --repeat << parameters.runs >> --use-base-schedule --use-whole-schedule-line
-            done
-          no_output_timeout: 2m
-      - save_logs_and_results
-      - save_regressions
-      - stack_trace
-
-  upload-coverage:
-    docker:
-      - image: 'citus/exttester:<< pipeline.parameters.pg15_version >><< pipeline.parameters.image_suffix >>'
-    working_directory: /home/circleci/project
-    steps:
-      - attach_workspace:
-          at: .
-      - run:
-          name: Upload coverage results to Code Climate
-          command: |
-            cc-test-reporter sum-coverage codeclimate/*.json -o total.json
-            cc-test-reporter upload-coverage -i total.json
-
-workflows:
-  version: 2
-  flaky_test_debugging:
-    jobs:
-      - build:
-          name: build-flaky-15
-          pg_major: 15
-          image_tag: '<< pipeline.parameters.pg15_version >>'
-
-      - test-flakyness:
-          name: 'test-15_flaky'
-          pg_major: 15
-          image_tag: '<< pipeline.parameters.pg15_version >>'
-          requires: [build-flaky-15]
-          test: '<< pipeline.parameters.flaky_test >>'
-          runs: << pipeline.parameters.flaky_test_runs_per_job >>
-
-  build_and_test:
-    jobs:
-      - build:
-          name: build-14
-          pg_major: 14
-          image_tag: '<< pipeline.parameters.pg14_version >>'
-      - build:
-          name: build-15
-          pg_major: 15
-          image_tag: '<< pipeline.parameters.pg15_version >>'
-      - build:
-          name: build-16
-          pg_major: 16
-          image_tag: '<< pipeline.parameters.pg16_version >>'
-
-      - check-style
-      - check-sql-snapshots
-
-      - test-citus: &test-citus-14
-          name: 'test-14_check-split'
-          make: check-split
-          pg_major: 14
-          image_tag: '<< pipeline.parameters.pg14_version >>'
-          requires: [build-14]
-      - test-citus:
-          <<:  *test-citus-14
-          name: 'test-14_check-enterprise'
-          make: check-enterprise
-      - test-citus:
-          <<:  *test-citus-14
-          name: 'test-14_check-enterprise-isolation'
-          make: check-enterprise-isolation
-      - test-citus:
-          <<:  *test-citus-14
-          name: 'test-14_check-enterprise-isolation-logicalrep-1'
-          make: check-enterprise-isolation-logicalrep-1
-      - test-citus:
-          <<:  *test-citus-14
-          name: 'test-14_check-enterprise-isolation-logicalrep-2'
-          make: check-enterprise-isolation-logicalrep-2
-      - test-citus:
-          <<:  *test-citus-14
-          name: 'test-14_check-enterprise-isolation-logicalrep-3'
-          make: check-enterprise-isolation-logicalrep-3
-      - test-citus:
-          <<:  *test-citus-14
-          name: 'test-14_check-enterprise-failure'
-          image: citus/failtester
-          make: check-enterprise-failure
-      - test-citus:
-          <<:  *test-citus-14
-          name: 'test-14_check-multi'
-          make: check-multi
-      - test-citus:
-          <<:  *test-citus-14
-          name: 'test-14_check-multi-1'
-          make: check-multi-1
-      - test-citus:
-          <<:  *test-citus-14
-          name: 'test-14_check-mx'
-          make: check-multi-mx
-      - test-citus:
-          <<:  *test-citus-14
-          name: 'test-14_check-vanilla'
-          make: check-vanilla
-      - test-citus:
-          <<:  *test-citus-14
-          name: 'test-14_check-isolation'
-          make: check-isolation
-      - test-citus:
-          <<:  *test-citus-14
-          name: 'test-14_check-operations'
-          make: check-operations
-      - test-citus:
-          <<:  *test-citus-14
-          name: 'test-14_check-follower-cluster'
-          make: check-follower-cluster
-      - test-citus:
-          <<:  *test-citus-14
-          name: 'test-14_check-columnar'
-          make: check-columnar
-      - test-citus:
-          <<:  *test-citus-14
-          name: 'test-14_check-columnar-isolation'
-          make: check-columnar-isolation
-      - test-citus:
-          <<:  *test-citus-14
-          name: 'test-14_check-failure'
-          image: citus/failtester
-          make: check-failure
-
-      - test-citus: &test-citus-15
-          name: 'test-15_check-split'
-          make: check-split
-          pg_major: 15
-          image_tag: '<< pipeline.parameters.pg15_version >>'
-          requires: [build-15]
-      - test-citus:
-          <<:  *test-citus-15
-          name: 'test-15_check-enterprise'
-          make: check-enterprise
-      - test-citus:
-          <<:  *test-citus-15
-          name: 'test-15_check-enterprise-isolation'
-          make: check-enterprise-isolation
-      - test-citus:
-          <<:  *test-citus-15
-          name: 'test-15_check-enterprise-isolation-logicalrep-1'
-          make: check-enterprise-isolation-logicalrep-1
-      - test-citus:
-          <<:  *test-citus-15
-          name: 'test-15_check-enterprise-isolation-logicalrep-2'
-          make: check-enterprise-isolation-logicalrep-2
-      - test-citus:
-          <<:  *test-citus-15
-          name: 'test-15_check-enterprise-isolation-logicalrep-3'
-          make: check-enterprise-isolation-logicalrep-3
-      - test-citus:
-          <<:  *test-citus-15
-          name: 'test-15_check-enterprise-failure'
-          image: citus/failtester
-          make: check-enterprise-failure
-      - test-citus:
-          <<:  *test-citus-15
-          name: 'test-15_check-multi'
-          make: check-multi
-      - test-citus:
-          <<:  *test-citus-15
-          name: 'test-15_check-multi-1'
-          make: check-multi-1
-      - test-citus:
-          <<:  *test-citus-15
-          name: 'test-15_check-mx'
-          make: check-multi-mx
-      - test-citus:
-          <<:  *test-citus-15
-          name: 'test-15_check-vanilla'
-          make: check-vanilla
-      - test-citus:
-          <<:  *test-citus-15
-          name: 'test-15_check-isolation'
-          make: check-isolation
-      - test-citus:
-          <<:  *test-citus-15
-          name: 'test-15_check-operations'
-          make: check-operations
-      - test-citus:
-          <<:  *test-citus-15
-          name: 'test-15_check-follower-cluster'
-          make: check-follower-cluster
-      - test-citus:
-          <<:  *test-citus-15
-          name: 'test-15_check-columnar'
-          make: check-columnar
-      - test-citus:
-          <<:  *test-citus-15
-          name: 'test-15_check-columnar-isolation'
-          make: check-columnar-isolation
-      - test-citus:
-          <<:  *test-citus-15
-          name: 'test-15_check-failure'
-          image: citus/failtester
-          make: check-failure
-
-      - test-citus: &test-citus-16
-          name: 'test-16_check-split'
-          make: check-split
-          pg_major: 16
-          image_tag: '<< pipeline.parameters.pg16_version >>'
-          requires: [build-16]
-      - test-citus:
-          <<:  *test-citus-16
-          name: 'test-16_check-enterprise'
-          make: check-enterprise
-      - test-citus:
-          <<:  *test-citus-16
-          name: 'test-16_check-enterprise-isolation'
-          make: check-enterprise-isolation
-      - test-citus:
-          <<:  *test-citus-16
-          name: 'test-16_check-enterprise-isolation-logicalrep-1'
-          make: check-enterprise-isolation-logicalrep-1
-      - test-citus:
-          <<:  *test-citus-16
-          name: 'test-16_check-enterprise-isolation-logicalrep-2'
-          make: check-enterprise-isolation-logicalrep-2
-      - test-citus:
-          <<:  *test-citus-16
-          name: 'test-16_check-enterprise-isolation-logicalrep-3'
-          make: check-enterprise-isolation-logicalrep-3
-      - test-citus:
-          <<:  *test-citus-16
-          name: 'test-16_check-enterprise-failure'
-          image: citus/failtester
-          make: check-enterprise-failure
-      - test-citus:
-          <<:  *test-citus-16
-          name: 'test-16_check-multi'
-          make: check-multi
-      - test-citus:
-          <<:  *test-citus-16
-          name: 'test-16_check-multi-1'
-          make: check-multi-1
-      - test-citus:
-          <<:  *test-citus-16
-          name: 'test-16_check-mx'
-          make: check-multi-mx
-      - test-citus:
-          <<:  *test-citus-16
-          name: 'test-16_check-vanilla'
-          make: check-vanilla
-      - test-citus:
-          <<:  *test-citus-16
-          name: 'test-16_check-isolation'
-          make: check-isolation
-      - test-citus:
-          <<:  *test-citus-16
-          name: 'test-16_check-operations'
-          make: check-operations
-      - test-citus:
-          <<:  *test-citus-16
-          name: 'test-16_check-follower-cluster'
-          make: check-follower-cluster
-      - test-citus:
-          <<:  *test-citus-16
-          name: 'test-16_check-columnar'
-          make: check-columnar
-      - test-citus:
-          <<:  *test-citus-16
-          name: 'test-16_check-columnar-isolation'
-          make: check-columnar-isolation
-      - test-citus:
-          <<:  *test-citus-16
-          name: 'test-16_check-failure'
-          image: citus/failtester
-          make: check-failure
-
-      - test-pytest:
-          name: 'test-14_pytest'
-          pg_major: 14
-          image_tag: '<< pipeline.parameters.pg14_version >>'
-          requires: [build-14]
-
-      - test-pytest:
-          name: 'test-15_pytest'
-          pg_major: 15
-          image_tag: '<< pipeline.parameters.pg15_version >>'
-          requires: [build-15]
-
-      - test-pytest:
-          name: 'test-16_pytest'
-          pg_major: 16
-          image_tag: '<< pipeline.parameters.pg16_version >>'
-          requires: [build-16]
-
-      - tap-test-citus:
-          name: 'test-15_tap-cdc'
-          suite: cdc
-          pg_major: 15
-          image_tag: '<< pipeline.parameters.pg15_version >>'
-          requires: [build-15]
-
-      - tap-test-citus:
-          name: 'test-16_tap-cdc'
-          suite: cdc
-          pg_major: 16
-          image_tag: '<< pipeline.parameters.pg16_version >>'
-          requires: [build-16]
-
-      - test-arbitrary-configs:
-          name: 'test-14_check-arbitrary-configs'
-          pg_major: 14
-          image_tag: '<< pipeline.parameters.pg14_version >>'
-          requires: [build-14]
-
-      - test-arbitrary-configs:
-          name: 'test-15_check-arbitrary-configs'
-          pg_major: 15
-          image_tag: '<< pipeline.parameters.pg15_version >>'
-          requires: [build-15]
-
-      - test-arbitrary-configs:
-          name: 'test-16_check-arbitrary-configs'
-          pg_major: 16
-          image_tag: '<< pipeline.parameters.pg16_version >>'
-          requires: [build-16]
-
-      - test-query-generator:
-          name: 'test-14_check-query-generator'
-          pg_major: 14
-          image_tag: '<< pipeline.parameters.pg14_version >>'
-          requires: [build-14]
-
-      - test-query-generator:
-          name: 'test-15_check-query-generator'
-          pg_major: 15
-          image_tag: '<< pipeline.parameters.pg15_version >>'
-          requires: [build-15]
-
-      - test-query-generator:
-          name: 'test-16_check-query-generator'
-          pg_major: 16
-          image_tag: '<< pipeline.parameters.pg16_version >>'
-          requires: [build-16]
-
-      - test-pg-upgrade:
-          name: 'test-14-15_check-pg-upgrade'
-          old_pg_major: 14
-          new_pg_major: 15
-          image_tag: '<< pipeline.parameters.upgrade_pg_versions >>'
-          requires: [build-14, build-15]
-
-      - test-pg-upgrade:
-          name: 'test-15-16_check-pg-upgrade'
-          old_pg_major: 15
-          new_pg_major: 16
-          image_tag: '<< pipeline.parameters.upgrade_pg_versions >>'
-          requires: [build-15, build-16]
-
-      - test-pg-upgrade:
-          name: 'test-14-16_check-pg-upgrade'
-          old_pg_major: 14
-          new_pg_major: 16
-          image_tag: '<< pipeline.parameters.upgrade_pg_versions >>'
-          requires: [build-14, build-16]
-
-      - test-citus-upgrade:
-          name: test-14_check-citus-upgrade
-          pg_major: 14
-          image_tag: '<< pipeline.parameters.pg14_version >>'
-          requires: [build-14]
-
-      - upload-coverage:
-          requires:
-            - test-14_check-multi
-            - test-14_check-multi-1
-            - test-14_check-mx
-            - test-14_check-vanilla
-            - test-14_check-isolation
-            - test-14_check-operations
-            - test-14_check-follower-cluster
-            - test-14_check-columnar
-            - test-14_check-columnar-isolation
-            - test-14_check-failure
-            - test-14_check-enterprise
-            - test-14_check-enterprise-isolation
-            - test-14_check-enterprise-isolation-logicalrep-1
-            - test-14_check-enterprise-isolation-logicalrep-2
-            - test-14_check-enterprise-isolation-logicalrep-3
-            - test-14_check-enterprise-failure
-            - test-14_check-split
-            - test-14_check-arbitrary-configs
-            - test-14_check-query-generator
-            - test-15_check-multi
-            - test-15_check-multi-1
-            - test-15_check-mx
-            - test-15_check-vanilla
-            - test-15_check-isolation
-            - test-15_check-operations
-            - test-15_check-follower-cluster
-            - test-15_check-columnar
-            - test-15_check-columnar-isolation
-            - test-15_check-failure
-            - test-15_check-enterprise
-            - test-15_check-enterprise-isolation
-            - test-15_check-enterprise-isolation-logicalrep-1
-            - test-15_check-enterprise-isolation-logicalrep-2
-            - test-15_check-enterprise-isolation-logicalrep-3
-            - test-15_check-enterprise-failure
-            - test-15_check-split
-            - test-15_check-arbitrary-configs
-            - test-15_check-query-generator
-            - test-16_check-multi
-            - test-16_check-multi-1
-            - test-16_check-mx
-            - test-16_check-vanilla
-            - test-16_check-isolation
-            - test-16_check-operations
-            - test-16_check-follower-cluster
-            - test-16_check-columnar
-            - test-16_check-columnar-isolation
-            - test-16_check-failure
-            - test-16_check-enterprise
-            - test-16_check-enterprise-isolation
-            - test-16_check-enterprise-isolation-logicalrep-1
-            - test-16_check-enterprise-isolation-logicalrep-2
-            - test-16_check-enterprise-isolation-logicalrep-3
-            - test-16_check-enterprise-failure
-            - test-16_check-split
-            - test-16_check-arbitrary-configs
-            - test-16_check-query-generator
-            - test-14-15_check-pg-upgrade
-            - test-15-16_check-pg-upgrade
-            - test-14-16_check-pg-upgrade
-            - test-14_check-citus-upgrade
-
-      - ch_benchmark:
-          requires: [build-14]
-          filters:
-            branches:
-              only:
-                - /ch_benchmark\/.*/ # match with ch_benchmark/ prefix
-      - tpcc_benchmark:
-          requires: [build-14]
-          filters:
-            branches:
-              only:
-                - /tpcc_benchmark\/.*/ # match with tpcc_benchmark/ prefix
-      - test-flakyness:
-          name: 'test-15_flaky'
-          pg_major: 15
-          image_tag: '<< pipeline.parameters.pg15_version >>'
-          requires: [build-15]
-          skip: << pipeline.parameters.skip_flaky_tests >>
diff --git a/ci/check_all_ci_scripts_are_run.sh b/ci/check_all_ci_scripts_are_run.sh
index 0b7abb3e3..12516f793 100755
--- a/ci/check_all_ci_scripts_are_run.sh
+++ b/ci/check_all_ci_scripts_are_run.sh
@@ -14,8 +14,8 @@ ci_scripts=$(
     grep -v -E '^(ci_helpers.sh|fix_style.sh)$'
 )
 for script in $ci_scripts; do
-    if ! grep "\\bci/$script\\b" .circleci/config.yml > /dev/null; then
-        echo "ERROR: CI script with name \"$script\" is not actually used in .circleci/config.yml"
+    if ! grep "\\bci/$script\\b" -r .github > /dev/null; then
+        echo "ERROR: CI script with name \"$script\" is not actually used in .github folder"
         exit 1
     fi
     if ! grep "^## \`$script\`\$" ci/README.md > /dev/null; then
diff --git a/ci/check_enterprise_merge.sh b/ci/check_enterprise_merge.sh
deleted file mode 100755
index d29ffcad8..000000000
--- a/ci/check_enterprise_merge.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-
-# Testing this script locally requires you to set the following environment
-# variables:
-# CIRCLE_BRANCH, GIT_USERNAME and GIT_TOKEN
-
-# fail if trying to reference a variable that is not set.
-set -u
-# exit immediately if a command fails
-set -e
-# Fail on pipe failures
-set -o pipefail
-
-PR_BRANCH="${CIRCLE_BRANCH}"
-ENTERPRISE_REMOTE="https://${GIT_USERNAME}:${GIT_TOKEN}@github.com/citusdata/citus-enterprise"
-
-# shellcheck disable=SC1091
-source ci/ci_helpers.sh
-
-# List executed commands. This is done so debugging this script is easier when
-# it fails. It's explicitly done after git remote add so username and password
-# are not shown in CI output (even though it's also filtered out by CircleCI)
-set -x
-
-check_compile () {
-    echo "INFO: checking if merged code can be compiled"
-    ./configure --without-libcurl
-    make -j10
-}
-
-# Clone current git repo (which should be community) to a temporary working
-# directory and go there
-GIT_DIR_ROOT="$(git rev-parse --show-toplevel)"
-TMP_GIT_DIR="$(mktemp --directory -t citus-merge-check.XXXXXXXXX)"
-git clone "$GIT_DIR_ROOT" "$TMP_GIT_DIR"
-cd "$TMP_GIT_DIR"
-
-# Fails in CI without this
-git config user.email "citus-bot@microsoft.com"
-git config user.name "citus bot"
-
-# Disable "set -x" temporarily, because $ENTERPRISE_REMOTE contains passwords
-{ set +x ; } 2> /dev/null
-git remote add enterprise "$ENTERPRISE_REMOTE"
-set -x
-
-git remote set-url --push enterprise no-pushing
-
-# Fetch enterprise-master
-git fetch enterprise enterprise-master
-
-
-git checkout "enterprise/enterprise-master"
-
-if git merge --no-commit "origin/$PR_BRANCH"; then
-    echo "INFO: community PR branch could be merged into enterprise-master"
-    # check that we can compile after the merge
-    if check_compile; then
-        exit 0
-    fi
-
-    echo "WARN: Failed to compile after community PR branch was merged into enterprise"
-fi
-
-# undo partial merge
-git merge --abort
-
-# If we have a conflict on enterprise merge on the master branch, we have a problem.
-# Provide an error message to indicate that enterprise merge is needed to fix this check.
-if [[ $PR_BRANCH = master ]]; then
-    echo "ERROR: Master branch has merge conflicts with enterprise-master."
-    echo "Try re-running this CI job after merging your changes into enterprise-master."
-    exit 1
-fi
-
-if ! git fetch enterprise "$PR_BRANCH" ; then
-    echo "ERROR: enterprise/$PR_BRANCH was not found and community PR branch could not be merged into enterprise-master"
-    exit 1
-fi
-
-# Show the top commit of the enterprise PR branch to make debugging easier
-git log -n 1 "enterprise/$PR_BRANCH"
-
-# Check that this branch contains the top commit of the current community PR
-# branch. If it does not it means it's not up to date with the current PR, so
-# the enterprise branch should be updated.
-if ! git merge-base --is-ancestor "origin/$PR_BRANCH" "enterprise/$PR_BRANCH" ; then
-    echo "ERROR: enterprise/$PR_BRANCH is not up to date with community PR branch"
-    exit 1
-fi
-
-# Now check if we can merge the enterprise PR into enterprise-master without
-# issues.
-git merge --no-commit "enterprise/$PR_BRANCH"
-# check that we can compile after the merge
-check_compile

From 81aa660b3140ec5312e0107daa920c628ec7a738 Mon Sep 17 00:00:00 2001
From: Jelte Fennema-Nio <jelte.fennema@microsoft.com>
Date: Tue, 31 Oct 2023 16:59:16 +0100
Subject: [PATCH 3/4] Fix flaky test detection (#7291)

PR #7289 broke flaky test detction. This fixes that.
---
 .github/workflows/build_and_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 5f087fc08..d285e4f50 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -478,7 +478,7 @@ jobs:
     name: Test flakyness
     runs-on: ubuntu-20.04
     container:
-      image: ${{ needs.params.outputs.fail_test_image_name }}:${{ needs.params.outputs.pg16_version }}${{ needs.params.outputs.image_suffix }}
+      image: ${{ needs.params.outputs.fail_test_image_name }}:${{ fromJson(needs.params.outputs.pg16_version).full }}${{ needs.params.outputs.image_suffix }}
       options: --user root
     env:
       runs: 8

From a76a832553ec4a9896d080c4b8bde8f1971aef0b Mon Sep 17 00:00:00 2001
From: Jelte Fennema-Nio <jelte.fennema@microsoft.com>
Date: Wed, 1 Nov 2023 09:41:28 +0100
Subject: [PATCH 4/4] Fix flaky validate_constraint test (#7293)

Sometimes validate constraint would fail like this:

```diff
  validatable_constraint_8000016 | t
 (10 rows)

 DROP TABLE constrained_table;
+ERROR:  deadlock detected
+DETAIL:  Process 16602 waits for ShareRowExclusiveLock on relation 56258 of database 16384; blocked by process 16601.
+Process 16601 waits for AccessShareLock on relation 56120 of database 16384; blocked by process 16602.
+HINT:  See server log for query details.
 DROP TABLE referenced_table CASCADE;
 DROP TABLE referencing_table;
 DROP SCHEMA validate_constraint CASCADE;
-NOTICE:  drop cascades to 3 other objects
+NOTICE:  drop cascades to 4 other objects
 DETAIL:  drop cascades to type constraint_validity
 drop cascades to view constraint_validations_in_workers
 drop cascades to view constraint_validations
+drop cascades to table constrained_table
 SET search_path TO DEFAULT;

```

Source:
https://github.com/citusdata/citus/actions/runs/6708383699?pr=7291

This change fixes that by not running together with the
foreign_key_to_reference_table test anymore. In passing it also
simplifies dropping of the test its resources.
---
 src/test/regress/expected/validate_constraint.out    | 8 +-------
 src/test/regress/multi_1_schedule                    | 3 ++-
 src/test/regress/multi_schedule_hyperscale           | 3 ++-
 src/test/regress/multi_schedule_hyperscale_superuser | 4 +++-
 src/test/regress/sql/validate_constraint.sql         | 5 +----
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/test/regress/expected/validate_constraint.out b/src/test/regress/expected/validate_constraint.out
index 08b03a2bf..b38e835fd 100644
--- a/src/test/regress/expected/validate_constraint.out
+++ b/src/test/regress/expected/validate_constraint.out
@@ -133,12 +133,6 @@ ORDER BY 1, 2;
  validatable_constraint_8000016 | t
 (10 rows)
 
-DROP TABLE constrained_table;
-DROP TABLE referenced_table CASCADE;
-DROP TABLE referencing_table;
+SET client_min_messages TO WARNING;
 DROP SCHEMA validate_constraint CASCADE;
-NOTICE:  drop cascades to 3 other objects
-DETAIL:  drop cascades to type constraint_validity
-drop cascades to view constraint_validations_in_workers
-drop cascades to view constraint_validations
 SET search_path TO DEFAULT;
diff --git a/src/test/regress/multi_1_schedule b/src/test/regress/multi_1_schedule
index ad70f136e..e824f5cba 100644
--- a/src/test/regress/multi_1_schedule
+++ b/src/test/regress/multi_1_schedule
@@ -201,7 +201,8 @@ test: citus_copy_shard_placement
 # multi_utilities cannot be run in parallel with other tests because it checks
 # global locks
 test: multi_utilities
-test: foreign_key_to_reference_table validate_constraint
+test: foreign_key_to_reference_table
+test: validate_constraint
 test: multi_repartition_udt multi_repartitioned_subquery_udf multi_subtransactions
 
 test: multi_modifying_xacts
diff --git a/src/test/regress/multi_schedule_hyperscale b/src/test/regress/multi_schedule_hyperscale
index 8849e81f2..86ac16d4f 100644
--- a/src/test/regress/multi_schedule_hyperscale
+++ b/src/test/regress/multi_schedule_hyperscale
@@ -154,7 +154,8 @@ test: multi_outer_join
 # ---
 test: multi_complex_count_distinct
 test: multi_upsert multi_simple_queries
-test: foreign_key_to_reference_table validate_constraint
+test: foreign_key_to_reference_table
+test: validate_constraint
 
 # ---------
 #  creates hash and range-partitioned tables and performs COPY
diff --git a/src/test/regress/multi_schedule_hyperscale_superuser b/src/test/regress/multi_schedule_hyperscale_superuser
index 052b93786..f5cddfc05 100644
--- a/src/test/regress/multi_schedule_hyperscale_superuser
+++ b/src/test/regress/multi_schedule_hyperscale_superuser
@@ -150,7 +150,9 @@ test: multi_outer_join
 test: multi_create_fdw
 test: multi_generate_ddl_commands multi_create_shards multi_prune_shard_list
 test: multi_upsert multi_simple_queries multi_data_types
-test: multi_utilities foreign_key_to_reference_table validate_constraint
+test: multi_utilities
+test: foreign_key_to_reference_table
+test: validate_constraint
 test: multi_repartition_udt multi_repartitioned_subquery_udf
 
 # ---------
diff --git a/src/test/regress/sql/validate_constraint.sql b/src/test/regress/sql/validate_constraint.sql
index 294e9a8b2..bb63f2854 100644
--- a/src/test/regress/sql/validate_constraint.sql
+++ b/src/test/regress/sql/validate_constraint.sql
@@ -116,9 +116,6 @@ SELECT *
 FROM constraint_validations_in_workers
 ORDER BY 1, 2;
 
-DROP TABLE constrained_table;
-DROP TABLE referenced_table CASCADE;
-DROP TABLE referencing_table;
-
+SET client_min_messages TO WARNING;
 DROP SCHEMA validate_constraint CASCADE;
 SET search_path TO DEFAULT;