Skip to content

Commit 4abf97e

Browse files
kelvichkelvich
committed
Run regression tests inside container
1 parent e8cdd30 commit 4abf97e

19 files changed

+270
-1239
lines changed

‎Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM alpine:latest
1+
FROM alpine:3.4
22

33
RUN apk add --update gcc libc-dev bison flex readline-dev zlib-dev perl make
44

5-
# there is already accidental postgres user in alpine, so call ours pg =/
5+
# there is already accidental postgres user in alpine
66
# RUN addgroup pg && adduser -h /pg -D -G pg pg
77
RUN mkdir /pg && chown postgres:postgres pg
88

‎contrib/mmts/Dockerfile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@ RUN cd /pg/src/contrib/raftable && make clean && make install
77
RUN mkdir /pg/mmts
88
COPY ./ /pg/mmts/
99

10-
ENV RAFTABLE_PATH /pg/src/contrib/raftable
11-
ENV USE_PGXS 1
12-
ENV PGDATA /pg/data
13-
14-
RUN cd /pg/mmts && make clean && make install
10+
RUN export RAFTABLE_PATH=/pg/src/contrib/raftable && \
11+
export USE_PGXS=1 && \
12+
cd /pg/mmts && make clean && make install
1513

16-
# RUN cd /pg/src/src/test/regress && make && ./pg_regress || true
14+
# pg_regress client assumes such dir exists on server
15+
RUN mkdir /pg/src/src/test/regress/results
1716

17+
ENV PGDATA /pg/data
1818
ENTRYPOINT ["/pg/mmts/tests2/docker-entrypoint.sh"]
1919

2020
EXPOSE 5432
2121
CMD ["postgres"]
22-

‎contrib/mmts/tests2/Vagrantfile

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎contrib/mmts/tests2/blockade.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎contrib/mmts/tests2/client2.py

Lines changed: 0 additions & 243 deletions
This file was deleted.

‎contrib/mmts/tests2/docker-entrypoint.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ if [ "$1" = 'postgres' ]; then
1616
-o "-c listen_addresses=''" \
1717
-w start
1818

19-
# : ${POSTGRES_USER:=postgres}
20-
# : ${POSTGRES_DB:=$POSTGRES_USER}
21-
# export POSTGRES_USER POSTGRES_DB
19+
: ${POSTGRES_USER:=postgres}
20+
: ${POSTGRES_DB:=$POSTGRES_USER}
21+
export POSTGRES_USER POSTGRES_DB
2222

2323
if [ "$POSTGRES_DB" != 'postgres' ]; then
2424
psql -U `whoami` postgres <<-EOSQL
@@ -57,13 +57,14 @@ if [ "$1" = 'postgres' ]; then
5757
multimaster.workers = 4
5858
multimaster.max_nodes = 3
5959
multimaster.use_raftable = false
60+
multimaster.volkswagen_mode = 1
6061
multimaster.queue_size=52857600
6162
multimaster.ignore_tables_without_pk = 1
6263
multimaster.node_id = $NODE_ID
6364
multimaster.conn_strings = '$CONNSTRS'
6465
multimaster.heartbeat_recv_timeout = 1000
6566
multimaster.heartbeat_send_timeout = 250
66-
multimaster.twopc_min_timeout = 2000
67+
multimaster.twopc_min_timeout = 400000
6768
EOF
6869

6970
pg_ctl -D "$PGDATA" -m fast -w stop

‎contrib/mmts/tests2/lib/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)