diff --git a/.circleci/config.yml b/.circleci/config.yml index 4e1f80eb3..252143b77 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -221,12 +221,27 @@ jobs: - attach_workspace: at: . - run: - name: 'Install and Test (check-isolation)' + name: 'Install and Test (check-columnar)' command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-columnar' no_output_timeout: 2m - codecov/upload: flags: 'test_11,columnar' + test-11_check-columnar-isolation: + docker: + - image: 'citus/exttester:11.9' + working_directory: /home/circleci/project + steps: + - checkout + - attach_workspace: + at: . + - run: + name: 'Install and Test (check-columnar-isolation)' + command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-columnar-isolation' + no_output_timeout: 2m + - codecov/upload: + flags: 'test_11,columnar,isolation' + test-11-12_check-pg-upgrade: docker: - image: 'citus/pgupgradetester:latest' @@ -374,12 +389,27 @@ jobs: - attach_workspace: at: . - run: - name: 'Install and Test (check-isolation)' + name: 'Install and Test (check-columnar)' command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-columnar' no_output_timeout: 2m - codecov/upload: flags: 'test_12,columnar' + test-12_check-columnar-isolation: + docker: + - image: 'citus/exttester:12.4' + working_directory: /home/circleci/project + steps: + - checkout + - attach_workspace: + at: . + - run: + name: 'Install and Test (check-columnar-isolation)' + command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-columnar-isolation' + no_output_timeout: 2m + - codecov/upload: + flags: 'test_12,columnar,isolation' + test-11_check-citus-upgrade: docker: - image: 'citus/citusupgradetester:11.9' @@ -525,12 +555,27 @@ jobs: - attach_workspace: at: . - run: - name: 'Install and Test (check-isolation)' + name: 'Install and Test (check-columnar)' command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-columnar' no_output_timeout: 2m - codecov/upload: flags: 'test_13,columnar' + test-13_check-columnar-isolation: + docker: + - image: 'citus/exttester:13.0' + working_directory: /home/circleci/project + steps: + - checkout + - attach_workspace: + at: . + - run: + name: 'Install and Test (check-columnar-isolation)' + command: 'chown -R circleci:circleci /home/circleci && install-and-test-ext check-columnar-isolation' + no_output_timeout: 2m + - codecov/upload: + flags: 'test_13,columnar,isolation' + check-merge-to-enterprise: docker: - image: citus/extbuilder:13.0 @@ -605,6 +650,8 @@ workflows: requires: [build-11] - test-11_check-columnar: requires: [build-11] + - test-11_check-columnar-isolation: + requires: [build-11] - test-12_check-multi: requires: [build-12] @@ -622,6 +669,8 @@ workflows: requires: [build-12] - test-12_check-columnar: requires: [build-12] + - test-12_check-columnar-isolation: + requires: [build-12] - test-13_check-multi: requires: [build-13] @@ -639,6 +688,8 @@ workflows: requires: [build-13] - test-13_check-columnar: requires: [build-13] + - test-13_check-columnar-isolation: + requires: [build-13] - test-11-12_check-pg-upgrade: requires: diff --git a/src/test/regress/Makefile b/src/test/regress/Makefile index b4990d151..2b2be20f9 100644 --- a/src/test/regress/Makefile +++ b/src/test/regress/Makefile @@ -170,17 +170,25 @@ check-failure-base: all -- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/failure_base_schedule $(EXTRA_TESTS) COLUMNAR_SCHEDULES = +COLUMNAR_ISOLATION_SCHEDULES = ifeq ($(USE_FDW),yes) COLUMNAR_SCHEDULES += columnar_fdw_schedule + COLUMNAR_ISOLATION_SCHEDULES += columnar_fdw_isolation_schedule endif ifeq ($(USE_TABLEAM),yes) COLUMNAR_SCHEDULES += columnar_am_schedule + COLUMNAR_ISOLATION_SCHEDULES += columnar_am_isolation_schedule endif check-columnar: $(pg_regress_multi_check) --load-extension=citus \ -- $(MULTI_REGRESS_OPTS) $(addprefix --schedule=$(citus_abs_srcdir)/,$(COLUMNAR_SCHEDULES)) $(EXTRA_TESTS) + +check-columnar-isolation: all $(isolation_test_files) + $(pg_regress_multi_check) --load-extension=citus --isolationtester \ + -- $(MULTI_REGRESS_OPTS) --inputdir=$(citus_abs_srcdir)/build $(addprefix --schedule=$(citus_abs_srcdir)/,$(COLUMNAR_ISOLATION_SCHEDULES)) $(EXTRA_TESTS) + check-pg-upgrade: $(pg_upgrade_check) --old-bindir=$(old-bindir) --new-bindir=$(new-bindir) --pgxsdir=$(pgxsdir) diff --git a/src/test/regress/columnar_am_isolation_schedule b/src/test/regress/columnar_am_isolation_schedule new file mode 100644 index 000000000..dab6e0acc --- /dev/null +++ b/src/test/regress/columnar_am_isolation_schedule @@ -0,0 +1,2 @@ +test: am_write_concurrency +test: am_vacuum_vs_insert diff --git a/src/test/regress/columnar_fdw_isolation_schedule b/src/test/regress/columnar_fdw_isolation_schedule new file mode 100644 index 000000000..4b9bae8a3 --- /dev/null +++ b/src/test/regress/columnar_fdw_isolation_schedule @@ -0,0 +1 @@ +# just an empty file now, please remove when we have a test