external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update docker images (#4122) 

* Update and separate test images

The build image was a single one and it would contain pg11, pg12 and
pg13. Now it is separated so that we can build each pg major
independently.

Tags are used as full postgres versions so that we can know which
version we use by looking at the tag. For example exttester:11.9 would
mean we are using pg11.9.

pg11 is updated from 11.5 to 11.9.
pg12 is updated from 12rc to 12.4.

* Ignore memory usage in pg13 explain

* Use citus instead of personal repo
pull/4124/head
SaitTalhaNisanci 2020-08-26 16:23:59 +03:00 committed by GitHub
parent f7c2af0411
commit 2459ba6eca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 123 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

173
.circleci/config.yml
View File

@ -4,9 +4,10 @@ orbs:
azure-cli: circleci/azure-cli@1.0.0 azure-cli: circleci/azure-cli@1.0.0
jobs: jobs:
build:
build-11:
docker: docker:
- image: 'citus/extbuilder-13:latest' - image: 'citus/extbuilder:11.9'
steps: steps:
- checkout - checkout
- run: - run:
@ -14,7 +15,38 @@ jobs:
command: build-ext command: build-ext
- persist_to_workspace: - persist_to_workspace:
root: . root: .
paths: [.] paths:
- build-11/*
- install-11.tar
build-12:
docker:
- image: 'citus/extbuilder:12.4'
steps:
- checkout
- run:
name: 'Configure, Build, and Install'
command: build-ext
- persist_to_workspace:
root: .
paths:
- build-12/*
- install-12.tar
build-13:
docker:
- image: 'citus/extbuilder:13beta3'
steps:
- checkout
- run:
name: 'Configure, Build, and Install'
command: build-ext
- persist_to_workspace:
root: .
paths:
- build-13/*
- install-13.tar
check-style: check-style:
docker: docker:
- image: 'citus/stylechecker:latest' - image: 'citus/stylechecker:latest'
@ -69,9 +101,10 @@ jobs:
command: ci/check_sql_snapshots.sh command: ci/check_sql_snapshots.sh
test-11_check-multi: test-11_check-multi:
docker: docker:
- image: 'citus/exttester-11:latest' - image: 'citus/exttester:11.9'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -85,9 +118,10 @@ jobs:
test-11_check-vanilla: test-11_check-vanilla:
docker: docker:
- image: 'citus/exttester-11:latest' - image: 'citus/exttester:11.9'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -99,9 +133,10 @@ jobs:
test-11_check-mx: test-11_check-mx:
docker: docker:
- image: 'citus/exttester-11:latest' - image: 'citus/exttester:11.9'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -113,9 +148,10 @@ jobs:
test-11_check-worker: test-11_check-worker:
docker: docker:
- image: 'citus/exttester-11:latest' - image: 'citus/exttester:11.9'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -127,9 +163,10 @@ jobs:
test-11_check-isolation: test-11_check-isolation:
docker: docker:
- image: 'citus/exttester-11:latest' - image: 'citus/exttester:11.9'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -140,9 +177,10 @@ jobs:
flags: 'test_11,isolation' flags: 'test_11,isolation'
test-11_check-follower-cluster: test-11_check-follower-cluster:
docker: docker:
- image: 'citus/exttester-11:latest' - image: 'citus/exttester:11.9'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -163,9 +201,10 @@ jobs:
path: '/tmp/core_dumps' path: '/tmp/core_dumps'
test-11_check-failure: test-11_check-failure:
docker: docker:
- image: 'citus/failtester-11:latest' - image: 'citus/failtester:11.9'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -178,6 +217,7 @@ jobs:
- image: 'citus/pgupgradetester:latest' - image: 'citus/pgupgradetester:latest'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -190,6 +230,7 @@ jobs:
- image: 'citus/pgupgradetester:latest' - image: 'citus/pgupgradetester:latest'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -199,9 +240,10 @@ jobs:
test-12_check-multi: test-12_check-multi:
docker: docker:
- image: 'citus/exttester-12:latest' - image: 'citus/exttester:12.4'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -212,9 +254,10 @@ jobs:
flags: 'test_12,multi' flags: 'test_12,multi'
test-12_check-vanilla: test-12_check-vanilla:
docker: docker:
- image: 'citus/exttester-12:latest' - image: 'citus/exttester:12.4'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -226,9 +269,10 @@ jobs:
test-12_check-mx: test-12_check-mx:
docker: docker:
- image: 'citus/exttester-12:latest' - image: 'citus/exttester:12.4'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -240,9 +284,10 @@ jobs:
test-12_check-isolation: test-12_check-isolation:
docker: docker:
- image: 'citus/exttester-12:latest' - image: 'citus/exttester:12.4'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -254,9 +299,10 @@ jobs:
test-12_check-worker: test-12_check-worker:
docker: docker:
- image: 'citus/exttester-12:latest' - image: 'citus/exttester:12.4'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -268,9 +314,10 @@ jobs:
test-12_check-follower-cluster: test-12_check-follower-cluster:
docker: docker:
- image: 'citus/exttester-12:latest' - image: 'citus/exttester:12.4'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -292,9 +339,10 @@ jobs:
test-12_check-failure: test-12_check-failure:
docker: docker:
- image: 'citus/failtester-12:latest' - image: 'citus/failtester:12.4'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -304,10 +352,12 @@ jobs:
test-11_check-citus-upgrade: test-11_check-citus-upgrade:
docker: docker:
- image: 'citus/citusupgradetester-11:latest' - image: 'citus/citusupgradetester:11.9'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- {attach_workspace: {at: .}} - checkout
- attach_workspace:
at: .
- run: - run:
name: 'Install and test citus upgrade' name: 'Install and test citus upgrade'
command: | command: |
@ -325,9 +375,10 @@ jobs:
test-13_check-multi: test-13_check-multi:
docker: docker:
- image: 'citus/exttester-13:latest' - image: 'citus/exttester:13beta3'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -339,9 +390,10 @@ jobs:
test-13_check-mx: test-13_check-mx:
docker: docker:
- image: 'citus/exttester-13:latest' - image: 'citus/exttester:13beta3'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -353,9 +405,10 @@ jobs:
test-13_check-vanilla: test-13_check-vanilla:
docker: docker:
- image: 'citus/exttester-13:latest' - image: 'citus/exttester:13beta3'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -367,9 +420,10 @@ jobs:
test-13_check-worker: test-13_check-worker:
docker: docker:
- image: 'citus/exttester-13:latest' - image: 'citus/exttester:13beta3'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -381,9 +435,10 @@ jobs:
test-13_check-isolation: test-13_check-isolation:
docker: docker:
- image: 'citus/exttester-13:latest' - image: 'citus/exttester:13beta3'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -395,9 +450,10 @@ jobs:
test-13_check-follower-cluster: test-13_check-follower-cluster:
docker: docker:
- image: 'citus/exttester-13:latest' - image: 'citus/exttester:13beta3'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -419,9 +475,10 @@ jobs:
test-13_check-failure: test-13_check-failure:
docker: docker:
- image: 'citus/failtester-13:latest' - image: 'citus/failtester:13beta3'
working_directory: /home/circleci/project working_directory: /home/circleci/project
steps: steps:
- checkout
- attach_workspace: - attach_workspace:
at: . at: .
- run: - run:
@ -472,77 +529,87 @@ workflows:
version: 2 version: 2
build_and_test: build_and_test:
jobs: jobs:
- check-merge-to-enterprise: - check-merge-to-enterprise:
filters: filters:
branches: branches:
ignore: ignore:
- /release-[0-9]+\.[0-9]+.*/ # match with releaseX.Y.* - /release-[0-9]+\.[0-9]+.*/ # match with releaseX.Y.*
- build
- build-11
- build-12
- build-13
- check-style - check-style
- check-sql-snapshots - check-sql-snapshots
- test-11_check-multi: - test-11_check-multi:
requires: [build] requires: [build-11]
- test-11_check-vanilla: - test-11_check-vanilla:
requires: [build] requires: [build-11]
- test-11_check-isolation: - test-11_check-isolation:
requires: [build] requires: [build-11]
- test-11_check-mx: - test-11_check-mx:
requires: [build] requires: [build-11]
- test-11_check-worker: - test-11_check-worker:
requires: [build] requires: [build-11]
- test-11_check-follower-cluster: - test-11_check-follower-cluster:
requires: [build] requires: [build-11]
- test-11_check-failure: - test-11_check-failure:
requires: [build] requires: [build-11]
- test-12_check-multi: - test-12_check-multi:
requires: [build] requires: [build-12]
- test-12_check-vanilla: - test-12_check-vanilla:
requires: [build] requires: [build-12]
- test-12_check-isolation: - test-12_check-isolation:
requires: [build] requires: [build-12]
- test-12_check-mx: - test-12_check-mx:
requires: [build] requires: [build-12]
- test-12_check-worker: - test-12_check-worker:
requires: [build] requires: [build-12]
- test-12_check-follower-cluster: - test-12_check-follower-cluster:
requires: [build] requires: [build-12]
- test-12_check-failure: - test-12_check-failure:
requires: [build] requires: [build-12]
- test-13_check-multi: - test-13_check-multi:
requires: [build] requires: [build-13]
- test-13_check-vanilla: - test-13_check-vanilla:
requires: [build] requires: [build-13]
- test-13_check-isolation: - test-13_check-isolation:
requires: [build] requires: [build-13]
- test-13_check-mx: - test-13_check-mx:
requires: [build] requires: [build-13]
- test-13_check-worker: - test-13_check-worker:
requires: [build] requires: [build-13]
- test-13_check-follower-cluster: - test-13_check-follower-cluster:
requires: [build] requires: [build-13]
- test-13_check-failure: - test-13_check-failure:
requires: [build] requires: [build-13]
- test-11-12_check-pg-upgrade: - test-11-12_check-pg-upgrade:
requires: [build] requires:
- build-11
- build-12
- test-12-13_check-pg-upgrade: - test-12-13_check-pg-upgrade:
requires: [build] requires:
- build-12
- build-13
- test-11_check-citus-upgrade: - test-11_check-citus-upgrade:
requires: [build] requires: [build-11]
- ch_benchmark: - ch_benchmark:
requires: [build] requires: [build-13]
filters: filters:
branches: branches:
only: only:
- /ch_benchmark\/.*/ # match with ch_benchmark/ prefix - /ch_benchmark\/.*/ # match with ch_benchmark/ prefix
- tpcc_benchmark: - tpcc_benchmark:
requires: [build] requires: [build-13]
filters: filters:
branches: branches:
only: only:

3
src/test/regress/bin/normalize.sed
View File

@ -136,6 +136,9 @@ s/pg_catalog.citus_extradata_container\([0-9]+/pg_catalog.citus_extradata_contai
# ignore referene table replication messages # ignore referene table replication messages
/replicating reference table.*$/d /replicating reference table.*$/d
# ignore memory usage output
/.*Memory Usage:.*/d
s/Citus.*currently supports/Citus currently supports/g s/Citus.*currently supports/Citus currently supports/g
# Warnings in multi_explain # Warnings in multi_explain

1
src/test/regress/expected/multi_explain.out
View File

@ -2280,7 +2280,6 @@ Custom Scan (Citus Adaptive) (actual rows=1 loops=1)
Hash Cond: (ref_table.a = intermediate_result.a) Hash Cond: (ref_table.a = intermediate_result.a)
-> Seq Scan on ref_table_570021 ref_table (actual rows=10 loops=1) -> Seq Scan on ref_table_570021 ref_table (actual rows=10 loops=1)
-> Hash (actual rows=10 loops=1) -> Hash (actual rows=10 loops=1)
Buckets: 1024 Batches: 1 Memory Usage: 9kB
-> Function Scan on read_intermediate_result intermediate_result (actual rows=10 loops=1) -> Function Scan on read_intermediate_result intermediate_result (actual rows=10 loops=1)
EXPLAIN :default_analyze_flags EXPLAIN :default_analyze_flags
SELECT count(distinct a) FROM (SELECT GREATEST(random(), 2) r, a FROM dist_table) t NATURAL JOIN ref_table; SELECT count(distinct a) FROM (SELECT GREATEST(random(), 2) r, a FROM dist_table) t NATURAL JOIN ref_table;