From 8f6ca3f0b91211e7d493075a6139aedcad7804d6 Mon Sep 17 00:00:00 2001 From: Gokhan Gulbiz Date: Wed, 1 Nov 2023 13:33:33 +0300 Subject: [PATCH] Reflect v11.0 changes to GHA workflow --- .github/workflows/build_and_test.yml | 90 ++++++++-------------------- 1 file changed, 25 insertions(+), 65 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 92057c75a..73a57d635 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -26,11 +26,10 @@ jobs: pgupgrade_image_name: "citus/pgupgradetester" style_checker_image_name: "citus/stylechecker" style_checker_tools_version: "0.8.18" - image_suffix: "-v9d71045" - 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" + image_suffix: "-vb4dd087" + pg13_version: '{ "major": "13", "full": "13.4" }' + pg14_version: '{ "major": "14", "full": "14.0" }' + upgrade_pg_versions: "12-13" steps: # Since GHA jobs needs at least one step we use a noop step here. - name: Set up parameters @@ -61,12 +60,6 @@ jobs: 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 @@ -89,8 +82,6 @@ jobs: 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 }} @@ -102,9 +93,8 @@ jobs: image_suffix: - ${{ needs.params.outputs.image_suffix}} pg_version: + - ${{ needs.params.outputs.pg13_version }} - ${{ needs.params.outputs.pg14_version }} - - ${{ needs.params.outputs.pg15_version }} - - ${{ needs.params.outputs.pg16_version }} runs-on: ubuntu-20.04 container: image: "${{ matrix.image_name }}:${{ fromJson(matrix.pg_version).full }}${{ matrix.image_suffix }}" @@ -133,16 +123,15 @@ jobs: image_name: - ${{ needs.params.outputs.test_image_name }} pg_version: + - ${{ needs.params.outputs.pg13_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-worker - check-operations - check-follower-cluster - check-columnar @@ -154,61 +143,37 @@ jobs: - check-enterprise-isolation-logicalrep-3 include: - make: check-failure - pg_version: ${{ needs.params.outputs.pg14_version }} + pg_version: ${{ needs.params.outputs.pg13_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 }} + pg_version: ${{ needs.params.outputs.pg13_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 + suite: recovery image_name: ${{ needs.params.outputs.test_image_name }} - pg_version: ${{ needs.params.outputs.pg15_version }} + pg_version: ${{ needs.params.outputs.pg13_version }} - make: installcheck - suite: cdc + suite: recovery + image_name: ${{ needs.params.outputs.test_image_name }} + pg_version: ${{ needs.params.outputs.pg14_version }} + - make: installcheck + suite: columnar_freezing + image_name: ${{ needs.params.outputs.test_image_name }} + pg_version: ${{ needs.params.outputs.pg13_version }} + - make: installcheck + suite: columnar_freezing 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 }}" @@ -249,9 +214,8 @@ jobs: image_name: - ${{ needs.params.outputs.fail_test_image_name }} pg_version: + - ${{ needs.params.outputs.pg13_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@v3.5.0 @@ -294,12 +258,8 @@ jobs: 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 + - old_pg_major: 13 + new_pg_major: 14 env: old_pg_major: ${{ matrix.old_pg_major }} new_pg_major: ${{ matrix.new_pg_major }} @@ -333,10 +293,10 @@ jobs: 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 + name: PG${{ fromJson(needs.params.outputs.pg13_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 }}" + image: "${{ needs.params.outputs.citusupgrade_image_name }}:${{ fromJson(needs.params.outputs.pg13_version).full }}${{ needs.params.outputs.image_suffix }}" options: --user root needs: - params