From 5292b26cba59eb927b69cac4fac022fb158b71e4 Mon Sep 17 00:00:00 2001 From: Jelte Fennema Date: Tue, 23 Aug 2022 09:03:06 +0200 Subject: [PATCH] split tests --- .circleci/config.yml | 326 ++++++++---------------------- src/test/regress/failure_schedule | 75 ------- 2 files changed, 82 insertions(+), 319 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 50f0e66bc..d6e5b773c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -530,75 +530,6 @@ workflows: pg_major: 14 image_tag: '<< pipeline.parameters.pg14_version >>' - - check-style - - check-sql-snapshots - - - test-citus: - name: 'test-13_check-multi' - pg_major: 13 - image_tag: '<< pipeline.parameters.pg13_version >>' - make: check-multi - requires: [build-13] - - test-citus: - name: 'test-13_check-multi-1' - pg_major: 13 - image_tag: '<< pipeline.parameters.pg13_version >>' - make: check-multi-1 - requires: [build-13] - - test-citus: - name: 'test-13_check-mx' - pg_major: 13 - image_tag: '<< pipeline.parameters.pg13_version >>' - make: check-multi-mx - requires: [build-13] - - test-citus: - name: 'test-13_check-vanilla' - pg_major: 13 - image_tag: '<< pipeline.parameters.pg13_version >>' - make: check-vanilla - requires: [build-13] - - test-citus: - name: 'test-13_check-isolation' - pg_major: 13 - image_tag: '<< pipeline.parameters.pg13_version >>' - make: check-isolation - requires: [build-13] - - test-citus: - name: 'test-13_check-operations' - pg_major: 13 - image_tag: '<< pipeline.parameters.pg13_version >>' - make: check-operations - requires: [build-13] - - test-citus: - name: 'test-13_check-follower-cluster' - pg_major: 13 - image_tag: '<< pipeline.parameters.pg13_version >>' - make: check-follower-cluster - requires: [build-13] - - test-citus: - name: 'test-13_check-columnar' - pg_major: 13 - image_tag: '<< pipeline.parameters.pg13_version >>' - make: check-columnar - requires: [build-13] - - test-citus: - name: 'test-13_check-columnar-isolation' - pg_major: 13 - image_tag: '<< pipeline.parameters.pg13_version >>' - make: check-columnar-isolation - requires: [build-13] - - tap-test-citus: - name: 'test-13_tap-recovery' - pg_major: 13 - image_tag: '<< pipeline.parameters.pg13_version >>' - suite: recovery - requires: [build-13] - - tap-test-citus: - name: 'test-13_tap-columnar-freezing' - pg_major: 13 - image_tag: '<< pipeline.parameters.pg13_version >>' - suite: columnar_freezing - requires: [build-13] - test-citus: name: 'test-13_check-failure' pg_major: 13 @@ -606,160 +537,55 @@ workflows: image_tag: '<< pipeline.parameters.pg13_version >>' make: check-failure requires: [build-13] - - test-citus: - name: 'test-13_check-enterprise' - pg_major: 13 - image_tag: '<< pipeline.parameters.pg13_version >>' - make: check-enterprise - requires: [build-13] - - test-citus: - name: 'test-13_check-enterprise-isolation' - pg_major: 13 - image_tag: '<< pipeline.parameters.pg13_version >>' - make: check-enterprise-isolation - requires: [build-13] - - test-citus: - name: 'test-13_check-enterprise-isolation-logicalrep-1' - pg_major: 13 - image_tag: '<< pipeline.parameters.pg13_version >>' - make: check-enterprise-isolation-logicalrep-1 - requires: [build-13] - - test-citus: - name: 'test-13_check-enterprise-isolation-logicalrep-2' - pg_major: 13 - image_tag: '<< pipeline.parameters.pg13_version >>' - make: check-enterprise-isolation-logicalrep-2 - requires: [build-13] - - test-citus: - name: 'test-13_check-enterprise-isolation-logicalrep-3' - pg_major: 13 - image_tag: '<< pipeline.parameters.pg13_version >>' - make: check-enterprise-isolation-logicalrep-3 - requires: [build-13] - - test-citus: - name: 'test-13_check-enterprise-failure' + name: 'test-13_check-failure-1' pg_major: 13 image: citus/failtester image_tag: '<< pipeline.parameters.pg13_version >>' - make: check-enterprise-failure + make: check-failure requires: [build-13] - test-citus: - name: 'test-13_check-split' + name: 'test-13_check-failure-2' pg_major: 13 - image_tag: '<< pipeline.parameters.pg13_version >>' - make: check-split - requires: [build-13] - - - test-citus: - name: 'test-14_check-split' - pg_major: 14 - image_tag: '<< pipeline.parameters.pg14_version >>' - make: check-split - requires: [build-14] - - test-citus: - name: 'test-14_check-enterprise' - pg_major: 14 - image_tag: '<< pipeline.parameters.pg14_version >>' - make: check-enterprise - requires: [build-14] - - test-citus: - name: 'test-14_check-enterprise-isolation' - pg_major: 14 - image_tag: '<< pipeline.parameters.pg14_version >>' - make: check-enterprise-isolation - requires: [build-14] - - test-citus: - name: 'test-14_check-enterprise-isolation-logicalrep-1' - pg_major: 14 - image_tag: '<< pipeline.parameters.pg14_version >>' - make: check-enterprise-isolation-logicalrep-1 - requires: [build-14] - - test-citus: - name: 'test-14_check-enterprise-isolation-logicalrep-2' - pg_major: 14 - image_tag: '<< pipeline.parameters.pg14_version >>' - make: check-enterprise-isolation-logicalrep-2 - requires: [build-14] - - test-citus: - name: 'test-14_check-enterprise-isolation-logicalrep-3' - pg_major: 14 - image_tag: '<< pipeline.parameters.pg14_version >>' - make: check-enterprise-isolation-logicalrep-3 - requires: [build-14] - - test-citus: - name: 'test-14_check-enterprise-failure' - pg_major: 14 image: citus/failtester - image_tag: '<< pipeline.parameters.pg14_version >>' - make: check-enterprise-failure - requires: [build-14] + image_tag: '<< pipeline.parameters.pg13_version >>' + make: check-failure + requires: [build-13] - test-citus: - name: 'test-14_check-multi' - pg_major: 14 - image_tag: '<< pipeline.parameters.pg14_version >>' - make: check-multi - requires: [build-14] + name: 'test-13_check-failure-3' + pg_major: 13 + image: citus/failtester + image_tag: '<< pipeline.parameters.pg13_version >>' + make: check-failure + requires: [build-13] - test-citus: - name: 'test-14_check-multi-1' - pg_major: 14 - image_tag: '<< pipeline.parameters.pg14_version >>' - make: check-multi-1 - requires: [build-14] + name: 'test-13_check-failure-4' + pg_major: 13 + image: citus/failtester + image_tag: '<< pipeline.parameters.pg13_version >>' + make: check-failure + requires: [build-13] - test-citus: - name: 'test-14_check-mx' - pg_major: 14 - image_tag: '<< pipeline.parameters.pg14_version >>' - make: check-multi-mx - requires: [build-14] + name: 'test-13_check-failure-5' + pg_major: 13 + image: citus/failtester + image_tag: '<< pipeline.parameters.pg13_version >>' + make: check-failure + requires: [build-13] - test-citus: - name: 'test-14_check-vanilla' - pg_major: 14 - image_tag: '<< pipeline.parameters.pg14_version >>' - make: check-vanilla - requires: [build-14] + name: 'test-13_check-failure-6' + pg_major: 13 + image: citus/failtester + image_tag: '<< pipeline.parameters.pg13_version >>' + make: check-failure + requires: [build-13] - test-citus: - name: 'test-14_check-isolation' - pg_major: 14 - image_tag: '<< pipeline.parameters.pg14_version >>' - make: check-isolation - requires: [build-14] - - test-citus: - name: 'test-14_check-operations' - pg_major: 14 - image_tag: '<< pipeline.parameters.pg14_version >>' - make: check-operations - requires: [build-14] - - test-citus: - name: 'test-14_check-follower-cluster' - pg_major: 14 - image_tag: '<< pipeline.parameters.pg14_version >>' - make: check-follower-cluster - requires: [build-14] - - test-citus: - name: 'test-14_check-columnar' - pg_major: 14 - image_tag: '<< pipeline.parameters.pg14_version >>' - make: check-columnar - requires: [build-14] - - test-citus: - name: 'test-14_check-columnar-isolation' - pg_major: 14 - image_tag: '<< pipeline.parameters.pg14_version >>' - make: check-columnar-isolation - requires: [build-14] - - tap-test-citus: - name: 'test-14_tap-recovery' - pg_major: 14 - image_tag: '<< pipeline.parameters.pg14_version >>' - suite: recovery - requires: [build-14] - - tap-test-citus: - name: 'test-14_tap-columnar-freezing' - pg_major: 14 - image_tag: '<< pipeline.parameters.pg14_version >>' - suite: columnar_freezing - requires: [build-14] + name: 'test-13_check-failure-7' + pg_major: 13 + image: citus/failtester + image_tag: '<< pipeline.parameters.pg13_version >>' + make: check-failure + requires: [build-13] - test-citus: name: 'test-14_check-failure' pg_major: 14 @@ -767,40 +593,52 @@ workflows: image_tag: '<< pipeline.parameters.pg14_version >>' make: check-failure requires: [build-14] - - - test-arbitrary-configs: - name: 'test-13_check-arbitrary-configs' - pg_major: 13 - image_tag: '<< pipeline.parameters.pg13_version >>' - requires: [build-13] - - test-arbitrary-configs: - name: 'test-14_check-arbitrary-configs' + - test-citus: + name: 'test-14_check-failure-1' pg_major: 14 + image: citus/failtester image_tag: '<< pipeline.parameters.pg14_version >>' + make: check-failure + requires: [build-14] + - test-citus: + name: 'test-14_check-failure-2' + pg_major: 14 + image: citus/failtester + image_tag: '<< pipeline.parameters.pg14_version >>' + make: check-failure + requires: [build-14] + - test-citus: + name: 'test-14_check-failure-3' + pg_major: 14 + image: citus/failtester + image_tag: '<< pipeline.parameters.pg14_version >>' + make: check-failure + requires: [build-14] + - test-citus: + name: 'test-14_check-failure-4' + pg_major: 14 + image: citus/failtester + image_tag: '<< pipeline.parameters.pg14_version >>' + make: check-failure + requires: [build-14] + - test-citus: + name: 'test-14_check-failure-5' + pg_major: 14 + image: citus/failtester + image_tag: '<< pipeline.parameters.pg14_version >>' + make: check-failure + requires: [build-14] + - test-citus: + name: 'test-14_check-failure-6' + pg_major: 14 + image: citus/failtester + image_tag: '<< pipeline.parameters.pg14_version >>' + make: check-failure + requires: [build-14] + - test-citus: + name: 'test-14_check-failure-7' + pg_major: 14 + image: citus/failtester + image_tag: '<< pipeline.parameters.pg14_version >>' + make: check-failure requires: [build-14] - - - test-pg-upgrade: - name: 'test-13-14_check-pg-upgrade' - old_pg_major: 13 - new_pg_major: 14 - image_tag: '<< pipeline.parameters.upgrade_pg_versions >>' - requires: [build-13, build-14] - - - test-citus-upgrade: - name: test-13_check-citus-upgrade - pg_major: 13 - image_tag: '<< pipeline.parameters.pg13_version >>' - requires: [build-13] - - - ch_benchmark: - requires: [build-13] - filters: - branches: - only: - - /ch_benchmark\/.*/ # match with ch_benchmark/ prefix - - tpcc_benchmark: - requires: [build-13] - filters: - branches: - only: - - /tpcc_benchmark\/.*/ # match with tpcc_benchmark/ prefix diff --git a/src/test/regress/failure_schedule b/src/test/regress/failure_schedule index 259bb87dc..795e5dee2 100644 --- a/src/test/regress/failure_schedule +++ b/src/test/regress/failure_schedule @@ -28,78 +28,3 @@ test: failure_connection_establishment test: failure_connection_establishment test: failure_connection_establishment test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment -test: failure_connection_establishment