From 4a118a7be2ec6ffad010798584c2b23614f99628 Mon Sep 17 00:00:00 2001
From: Jelte Fennema-Nio <github-tech@jeltef.nl>
Date: Fri, 14 Jun 2024 14:51:59 +0200
Subject: [PATCH] Minimize testing stuff

---
 .github/workflows/build_and_test.yml          | 422 +-----------------
 .../workflows/packaging-test-pipelines.yml    |   2 -
 src/test/regress/enterprise_schedule          |  39 +-
 3 files changed, 3 insertions(+), 460 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index cd4995e20..3652060d5 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -8,7 +8,7 @@ on:
     inputs:
       skip_test_flakyness:
         required: false
-        default: false
+        default: true
         type: boolean
   push:
     branches:
@@ -40,64 +40,6 @@ jobs:
       # Since GHA jobs needs at least one step we use a noop step here.
       - name: Set up parameters
         run: echo 'noop'
-  check-sql-snapshots:
-    needs: params
-    runs-on: ubuntu-20.04
-    container:
-      image: ${{ needs.params.outputs.build_image_name }}:latest
-      options: --user root
-    steps:
-    - uses: actions/checkout@v3.5.0
-    - name: Check Snapshots
-      run: |
-        git config --global --add safe.directory ${GITHUB_WORKSPACE}
-        ci/check_sql_snapshots.sh
-  check-style:
-    needs: params
-    runs-on: ubuntu-20.04
-    container:
-      image: ${{ needs.params.outputs.style_checker_image_name }}:${{ needs.params.outputs.style_checker_tools_version }}${{ needs.params.outputs.image_suffix }}
-    steps:
-    - name: Check Snapshots
-      run: |
-        git config --global --add safe.directory ${GITHUB_WORKSPACE}
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: Check C Style
-      run: citus_indent --check
-    - name: Check Python style
-      run: black --check .
-    - name: Check Python import order
-      run: isort --check .
-    - name: Check Python lints
-      run: flake8 .
-    - name: Fix whitespace
-      run: ci/editorconfig.sh && git diff --exit-code
-    - name: Remove useless declarations
-      run: ci/remove_useless_declarations.sh && git diff --cached --exit-code
-    - name: Sort and group includes
-      run: ci/sort_and_group_includes.sh && git diff --exit-code
-    - name: Normalize test output
-      run: ci/normalize_expected.sh && git diff --exit-code
-    - name: Check for C-style comments in migration files
-      run: ci/disallow_c_comments_in_migrations.sh && git diff --exit-code
-    - name: 'Check for comment--cached ns that start with # character in spec files'
-      run: ci/disallow_hash_comments_in_spec_files.sh && git diff --exit-code
-    - name: Check for gitignore entries .for source files
-      run: ci/fix_gitignore.sh && git diff --exit-code
-    - name: Check for lengths of changelog entries
-      run: ci/disallow_long_changelog_entries.sh
-    - name: Check for banned C API usage
-      run: ci/banned.h.sh
-    - name: Check for tests missing in schedules
-      run: ci/check_all_tests_are_run.sh
-    - name: Check if all CI scripts are actually run
-      run: ci/check_all_ci_scripts_are_run.sh
-    - name: Check if all GUCs are sorted alphabetically
-      run: ci/check_gucs_are_alphabetically_sorted.sh
-    - name: Check for missing downgrade scripts
-      run: ci/check_migration_files.sh
   build:
     needs: params
     name: Build for PG${{ fromJson(matrix.pg_version).major }}
@@ -109,8 +51,6 @@ jobs:
         image_suffix:
           - ${{ needs.params.outputs.image_suffix}}
         pg_version:
-          - ${{ needs.params.outputs.pg14_version }}
-          - ${{ needs.params.outputs.pg15_version }}
           - ${{ needs.params.outputs.pg16_version }}
     runs-on: ubuntu-20.04
     container:
@@ -140,82 +80,9 @@ jobs:
         image_name:
           - ${{ needs.params.outputs.test_image_name }}
         pg_version:
-          - ${{ needs.params.outputs.pg14_version }}
-          - ${{ needs.params.outputs.pg15_version }}
           - ${{ needs.params.outputs.pg16_version }}
         make:
-          - check-split
-          - check-multi
-          - check-multi-1
-          - check-multi-mx
-          - check-vanilla
-          - check-isolation
-          - check-operations
-          - check-follower-cluster
-          - check-columnar
-          - check-columnar-isolation
           - check-enterprise
-          - check-enterprise-isolation
-          - check-enterprise-isolation-logicalrep-1
-          - check-enterprise-isolation-logicalrep-2
-          - check-enterprise-isolation-logicalrep-3
-        include:
-          - make: check-failure
-            pg_version: ${{ needs.params.outputs.pg14_version }}
-            suite: regress
-            image_name: ${{ needs.params.outputs.fail_test_image_name }}
-          - make: check-failure
-            pg_version: ${{ needs.params.outputs.pg15_version }}
-            suite: regress
-            image_name: ${{ needs.params.outputs.fail_test_image_name }}
-          - make: check-failure
-            pg_version: ${{ needs.params.outputs.pg16_version }}
-            suite: regress
-            image_name: ${{ needs.params.outputs.fail_test_image_name }}
-          - make: check-enterprise-failure
-            pg_version: ${{ needs.params.outputs.pg14_version }}
-            suite: regress
-            image_name: ${{ needs.params.outputs.fail_test_image_name }}
-          - make: check-enterprise-failure
-            pg_version: ${{ needs.params.outputs.pg15_version }}
-            suite: regress
-            image_name: ${{ needs.params.outputs.fail_test_image_name }}
-          - make: check-enterprise-failure
-            pg_version: ${{ needs.params.outputs.pg16_version }}
-            suite: regress
-            image_name: ${{ needs.params.outputs.fail_test_image_name }}
-          - make: check-pytest
-            pg_version: ${{ needs.params.outputs.pg14_version }}
-            suite: regress
-            image_name: ${{ needs.params.outputs.fail_test_image_name }}
-          - make: check-pytest
-            pg_version: ${{ needs.params.outputs.pg15_version }}
-            suite: regress
-            image_name: ${{ needs.params.outputs.fail_test_image_name }}
-          - make: check-pytest
-            pg_version: ${{ needs.params.outputs.pg16_version }}
-            suite: regress
-            image_name: ${{ needs.params.outputs.fail_test_image_name }}
-          - make: installcheck
-            suite: cdc
-            image_name: ${{ needs.params.outputs.test_image_name }}
-            pg_version: ${{ needs.params.outputs.pg15_version }}
-          - make: installcheck
-            suite: cdc
-            image_name: ${{ needs.params.outputs.test_image_name }}
-            pg_version: ${{ needs.params.outputs.pg16_version }}
-          - make: check-query-generator
-            pg_version: ${{ needs.params.outputs.pg14_version }}
-            suite: regress
-            image_name: ${{ needs.params.outputs.fail_test_image_name }}
-          - make: check-query-generator
-            pg_version: ${{ needs.params.outputs.pg15_version }}
-            suite: regress
-            image_name: ${{ needs.params.outputs.fail_test_image_name }}
-          - make: check-query-generator
-            pg_version: ${{ needs.params.outputs.pg16_version }}
-            suite: regress
-            image_name: ${{ needs.params.outputs.fail_test_image_name }}
     runs-on: ubuntu-20.04
     container:
       image: "${{ matrix.image_name }}:${{ fromJson(matrix.pg_version).full }}${{ needs.params.outputs.image_suffix }}"
@@ -241,290 +108,3 @@ jobs:
       with:
         flags: ${{ env.PG_MAJOR }}_${{ matrix.suite }}_${{ matrix.make }}
         codecov_token: ${{ secrets.CODECOV_TOKEN }}
-  test-arbitrary-configs:
-    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 }}:${{ fromJson(matrix.pg_version).full }}${{ needs.params.outputs.image_suffix }}"
-      options: --user root
-    needs:
-      - params
-      - build
-    strategy:
-      fail-fast: false
-      matrix:
-        image_name:
-          - ${{ needs.params.outputs.fail_test_image_name }}
-        pg_version:
-          - ${{ needs.params.outputs.pg14_version }}
-          - ${{ needs.params.outputs.pg15_version }}
-          - ${{ needs.params.outputs.pg16_version }}
-        parallel: [0,1,2,3,4,5] # workaround for running 6 parallel jobs
-    steps:
-    - uses: actions/checkout@v4
-    - uses: "./.github/actions/setup_extension"
-    - name: Test arbitrary configs
-      run: |-
-        # we use parallel jobs to split the tests into 6 parts and run them in parallel
-        # the script below extracts the tests for the current job
-        N=6  # Total number of jobs (see matrix.parallel)
-        X=${{ matrix.parallel }}  # Current job number
-        TESTS=$(src/test/regress/citus_tests/print_test_names.py |
-          tr '\n' ',' | awk -v N="$N" -v X="$X" -F, '{
-            split("", parts)
-            for (i = 1; i <= NF; i++) {
-                parts[i % N] = parts[i % N] $i ","
-            }
-            print substr(parts[X], 1, length(parts[X])-1)
-        }')
-        echo $TESTS
-        gosu circleci \
-          make -C src/test/regress \
-            check-arbitrary-configs parallel=4 CONFIGS=$TESTS
-    - uses: "./.github/actions/save_logs_and_results"
-      if: always()
-    - uses: "./.github/actions/upload_coverage"
-      if: always()
-      with:
-        flags: ${{ env.pg_major }}_upgrade
-        codecov_token: ${{ secrets.CODECOV_TOKEN }}
-  test-pg-upgrade:
-    name: PG${{ matrix.old_pg_major }}-PG${{ matrix.new_pg_major }} - check-pg-upgrade
-    runs-on: ubuntu-20.04
-    container:
-      image: "${{ needs.params.outputs.pgupgrade_image_name }}:${{ needs.params.outputs.upgrade_pg_versions }}${{ needs.params.outputs.image_suffix }}"
-      options: --user root
-    needs:
-    - params
-    - build
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - old_pg_major: 14
-            new_pg_major: 15
-          - old_pg_major: 15
-            new_pg_major: 16
-          - old_pg_major: 14
-            new_pg_major: 16
-    env:
-      old_pg_major: ${{ matrix.old_pg_major }}
-      new_pg_major: ${{ matrix.new_pg_major }}
-    steps:
-    - uses: actions/checkout@v4
-    - uses: "./.github/actions/setup_extension"
-      with:
-        pg_major: "${{ env.old_pg_major }}"
-    - uses: "./.github/actions/setup_extension"
-      with:
-        pg_major: "${{ env.new_pg_major }}"
-    - name: Install and test postgres upgrade
-      run: |-
-        gosu circleci \
-          make -C src/test/regress \
-            check-pg-upgrade \
-            old-bindir=/usr/lib/postgresql/${{ env.old_pg_major }}/bin \
-            new-bindir=/usr/lib/postgresql/${{ env.new_pg_major }}/bin
-    - name: Copy pg_upgrade logs for newData dir
-      run: |-
-        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
-      if: failure()
-    - uses: "./.github/actions/save_logs_and_results"
-      if: always()
-    - uses: "./.github/actions/upload_coverage"
-      if: always()
-      with:
-        flags: ${{ env.old_pg_major }}_${{ env.new_pg_major }}_upgrade
-        codecov_token: ${{ secrets.CODECOV_TOKEN }}
-  test-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 }}:${{ fromJson(needs.params.outputs.pg14_version).full }}${{ needs.params.outputs.image_suffix }}"
-      options: --user root
-    needs:
-    - params
-    - build
-    steps:
-    - uses: actions/checkout@v4
-    - uses: "./.github/actions/setup_extension"
-      with:
-        skip_installation: true
-    - name: Install and test citus upgrade
-      run: |-
-        # 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=${GITHUB_WORKSPACE}/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=${GITHUB_WORKSPACE}/install-$PG_MAJOR.tar; \
-        done;
-    - uses: "./.github/actions/save_logs_and_results"
-      if: always()
-    - uses: "./.github/actions/upload_coverage"
-      if: always()
-      with:
-        flags: ${{ env.pg_major }}_upgrade
-        codecov_token: ${{ secrets.CODECOV_TOKEN }}
-  upload-coverage:
-    if: always()
-    env:
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-    runs-on: ubuntu-20.04
-    container:
-      image: ${{ needs.params.outputs.test_image_name }}:${{ fromJson(needs.params.outputs.pg16_version).full }}${{ needs.params.outputs.image_suffix }}
-    needs:
-      - params
-      - test-citus
-      - test-arbitrary-configs
-      - test-citus-upgrade
-      - test-pg-upgrade
-    steps:
-      - uses: actions/download-artifact@v3.0.1
-        with:
-          name: "codeclimate"
-          path: "codeclimate"
-      - name: Upload coverage results to Code Climate
-        run: |-
-          cc-test-reporter sum-coverage codeclimate/*.json -o total.json
-          cc-test-reporter upload-coverage -i total.json
-  ch_benchmark:
-    name: CH Benchmark
-    if: startsWith(github.ref, 'refs/heads/ch_benchmark/')
-    runs-on: ubuntu-20.04
-    needs:
-    - build
-    steps:
-    - uses: actions/checkout@v4
-    - uses: azure/login@v1
-      with:
-        creds: ${{ secrets.AZURE_CREDENTIALS }}
-    - name: install dependencies and run ch_benchmark tests
-      uses: azure/CLI@v1
-      with:
-        inlineScript: |
-          cd ./src/test/hammerdb
-          chmod +x run_hammerdb.sh
-          run_hammerdb.sh citusbot_ch_benchmark_rg
-  tpcc_benchmark:
-    name: TPCC Benchmark
-    if: startsWith(github.ref, 'refs/heads/tpcc_benchmark/')
-    runs-on: ubuntu-20.04
-    needs:
-    - build
-    steps:
-    - uses: actions/checkout@v4
-    - uses: azure/login@v1
-      with:
-        creds: ${{ secrets.AZURE_CREDENTIALS }}
-    - name: install dependencies and run tpcc_benchmark tests
-      uses: azure/CLI@v1
-      with:
-        inlineScript: |
-          cd ./src/test/hammerdb
-          chmod +x run_hammerdb.sh
-          run_hammerdb.sh citusbot_tpcc_benchmark_rg
-  prepare_parallelization_matrix_32:
-    name: Parallel 32
-    if: ${{ needs.test-flakyness-pre.outputs.tests != ''}}
-    needs: test-flakyness-pre
-    runs-on: ubuntu-20.04
-    outputs:
-      json: ${{ steps.parallelization.outputs.json }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: "./.github/actions/parallelization"
-        id: parallelization
-        with:
-          count: 32
-  test-flakyness-pre:
-    name: Detect regression tests need to be ran
-    if: ${{ !inputs.skip_test_flakyness }}}
-    runs-on: ubuntu-20.04
-    needs: build
-    outputs:
-      tests: ${{ steps.detect-regression-tests.outputs.tests }}
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: Detect regression tests need to be ran
-      id: detect-regression-tests
-      run: |-
-        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}
-
-        # split the tests to be skipped --today we only skip upgrade tests
-        skipped_tests=""
-        not_skipped_tests=""
-        for test in $tests; do
-            if [[ $test =~ ^src/test/regress/sql/upgrade_ ]]; then
-                skipped_tests="$skipped_tests $test"
-            else
-                not_skipped_tests="$not_skipped_tests $test"
-            fi
-        done
-
-        if [ ! -z "$skipped_tests" ]; then
-            echo "Skipped tests " $skipped_tests
-        fi
-
-        if [ -z "$not_skipped_tests" ]; then
-            echo "Not detected any tests that flaky test detection should run"
-        else
-            echo "Detected tests " $not_skipped_tests
-        fi
-
-        echo 'tests<<EOF' >> $GITHUB_OUTPUT
-        echo "$not_skipped_tests" >> "$GITHUB_OUTPUT"
-        echo 'EOF' >> $GITHUB_OUTPUT
-  test-flakyness:
-    if: ${{ needs.test-flakyness-pre.outputs.tests != ''}}
-    name: Test flakyness
-    runs-on: ubuntu-20.04
-    container:
-      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
-    needs:
-    - params
-    - build
-    - test-flakyness-pre
-    - prepare_parallelization_matrix_32
-    strategy:
-      fail-fast: false
-      matrix: ${{ fromJson(needs.prepare_parallelization_matrix_32.outputs.json) }}
-    steps:
-    - uses: actions/checkout@v4
-    - uses: "./.github/actions/setup_extension"
-    - name: Run minimal tests
-      run: |-
-        tests="${{ needs.test-flakyness-pre.outputs.tests }}"
-        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 ${{ env.runs }} --use-whole-schedule-line
-        done
-      shell: bash
-    - uses: "./.github/actions/save_logs_and_results"
-      if: always()
diff --git a/.github/workflows/packaging-test-pipelines.yml b/.github/workflows/packaging-test-pipelines.yml
index 4ae741a91..2c1b56fa9 100644
--- a/.github/workflows/packaging-test-pipelines.yml
+++ b/.github/workflows/packaging-test-pipelines.yml
@@ -1,8 +1,6 @@
 name: Build tests in packaging images
 
 on:
-  pull_request:
-    types: [opened, reopened,synchronize]
   merge_group:
 
   workflow_dispatch:
diff --git a/src/test/regress/enterprise_schedule b/src/test/regress/enterprise_schedule
index 9a832c4d6..8e8c2d8c7 100644
--- a/src/test/regress/enterprise_schedule
+++ b/src/test/regress/enterprise_schedule
@@ -1,41 +1,6 @@
-# should come before multi_cluster_management
-# as it touches node metadata
-test: single_node_enterprise
-
-test: multi_test_helpers multi_test_helpers_superuser
-test: multi_cluster_management
-test: multi_test_catalog_views
-test: multi_data_types
-test: multi_tenant_isolation
-test: multi_tenant_isolation_nonblocking
-
-# --------
-# Tests that require adding coordinator to pg_dist_node
-# --------
-test: add_coordinator
-
-test: citus_local_tables_ent
-
-# --------
-
-test: publication
-test: logical_replication
-test: check_cluster_state
+test: minimal_cluster_management
+test: multi_test_helpers multi_test_helpers_superuser multi_create_fdw columnar_test_helpers multi_test_catalog_views tablespace
 test: multi_create_table
-test: multi_create_table_superuser
-test: multi_create_role_dependency
 test: multi_create_users
-test: multi_multiuser_master_protocol
 test: multi_multiuser_load_data
-test: multi_multiuser_basic_queries
-test: multi_multiuser_grant
-test: multi_multiuser_copy
 test: multi_multiuser_auth
-test: multi_poolinfo_usage
-test: multi_alter_table_row_level_security
-test: multi_alter_table_row_level_security_escape
-test: stat_statements
-test: shard_move_constraints
-test: shard_move_constraints_blocking
-test: logical_rep_consistency
-test: check_mx