Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add cockroach backend to ci #2680

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Add cockroach backend to ci #2680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
22c31ae
Setup a docker container with cockroach
mkacper Mar 20, 2020
4721f70
Try to run cockroach on CircleCI
mkacper Mar 20, 2020
69e86c8
Change user and database names for cockroach
mkacper Mar 20, 2020
c5d0a18
Update test.config
mkacper Mar 20, 2020
c01bd6f
Fixing CockroachDB compat vol. 1
mkacper Mar 25, 2020
0a5ca3e
[skip ci] Fix some rdbms_SUITE
mkacper Mar 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
226 changes: 113 additions & 113 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,131 +298,131 @@ workflows:
build_and_test:
jobs:
# ============= PACKAGES =============
- mim/package:
name: centos_7
platform: centos_7
otp_package: 22.1.8-2
context: mongooseim-org
filters: *all_tags
- mim/package:
name: debian_stretch
platform: debian_stretch
otp_package: 22.1.8-1
context: mongooseim-org
filters: *all_tags
# ============= BASE BUILDS =============
- mim/build:
name: otp_21_3
otp_package: 21.3.8.6-1
context: mongooseim-org
filters: *all_tags
#- mim/package:
# name: centos_7
# platform: centos_7
# otp_package: 22.1.8-2
# context: mongooseim-org
# filters: *all_tags
#- mim/package:
# name: debian_stretch
# platform: debian_stretch
# otp_package: 22.1.8-1
# context: mongooseim-org
# filters: *all_tags
## ============= BASE BUILDS =============
#- mim/build:
# name: otp_21_3
# otp_package: 21.3.8.6-1
# context: mongooseim-org
# filters: *all_tags
- mim/build:
name: otp_22
otp_package: 22.1.8-1
build_prod: true
context: mongooseim-org
filters: *all_tags
# ============= SMALL TESTS =============
- mim/small_tests:
name: small_tests_21_3
otp_package: 21.3.8.6-1
context: mongooseim-org
requires:
- otp_21_3
filters: *all_tags
- mim/small_tests:
name: small_tests_22
otp_package: 22.1.8-1
context: mongooseim-org
requires:
- otp_22
filters: *all_tags
# ============= DIALYZER =============
- mim/dialyzer:
name: dialyzer
otp_package: 22.1.8-1
context: mongooseim-org
filters: *all_tags
# ============= MOST RECENT VERSION TESTS =============
- mim/big_tests:
name: mysql_redis
otp_package: 22.1.8-1
preset: mysql_redis
db: mysql
context: mongooseim-org
requires:
- otp_22
filters: *all_tags
- mim/big_tests:
name: mssql_mnesia
otp_package: 22.1.8-1
preset: odbc_mssql_mnesia
db: mssql
context: mongooseim-org
requires:
- otp_22
filters: *all_tags
- mim/big_tests:
name: internal_mnesia
otp_package: 22.1.8-1
preset: internal_mnesia
db: mnesia
tls_dist: true
context: mongooseim-org
requires:
- otp_22
filters: *all_tags
- mim/big_tests:
name: elasticsearch_and_cassandra
otp_package: 22.1.8-1
preset: elasticsearch_and_cassandra_mnesia
db: "elasticsearch cassandra"
context: mongooseim-org
requires:
- otp_22
filters: *all_tags
- mim/big_tests:
name: riak_mnesia
otp_package: 22.1.8-1
preset: riak_mnesia
db: riak
context: mongooseim-org
requires:
- otp_22
filters: *all_tags
## ============= SMALL TESTS =============
#- mim/small_tests:
# name: small_tests_21_3
# otp_package: 21.3.8.6-1
# context: mongooseim-org
# requires:
# - otp_21_3
# filters: *all_tags
#- mim/small_tests:
# name: small_tests_22
# otp_package: 22.1.8-1
# context: mongooseim-org
# requires:
# - otp_22
# filters: *all_tags
## ============= DIALYZER =============
#- mim/dialyzer:
# name: dialyzer
# otp_package: 22.1.8-1
# context: mongooseim-org
# filters: *all_tags
## ============= MOST RECENT VERSION TESTS =============
#- mim/big_tests:
# name: mysql_redis
# otp_package: 22.1.8-1
# preset: mysql_redis
# db: mysql
# context: mongooseim-org
# requires:
# - otp_22
# filters: *all_tags
#- mim/big_tests:
# name: mssql_mnesia
# otp_package: 22.1.8-1
# preset: odbc_mssql_mnesia
# db: mssql
# context: mongooseim-org
# requires:
# - otp_22
# filters: *all_tags
#- mim/big_tests:
# name: internal_mnesia
# otp_package: 22.1.8-1
# preset: internal_mnesia
# db: mnesia
# tls_dist: true
# context: mongooseim-org
# requires:
# - otp_22
# filters: *all_tags
#- mim/big_tests:
# name: elasticsearch_and_cassandra
# otp_package: 22.1.8-1
# preset: elasticsearch_and_cassandra_mnesia
# db: "elasticsearch cassandra"
# context: mongooseim-org
# requires:
# - otp_22
# filters: *all_tags
#- mim/big_tests:
# name: riak_mnesia
# otp_package: 22.1.8-1
# preset: riak_mnesia
# db: riak
# context: mongooseim-org
# requires:
# - otp_22
# filters: *all_tags
- mim/big_tests:
name: pgsql_mnesia
otp_package: 22.1.8-1
preset: pgsql_mnesia
db: pgsql
db: cockroach
context: mongooseim-org
requires:
- otp_22
filters: *all_tags
# ============= 1 VERSION OLDER TESTS =============
- mim/big_tests:
name: ldap_mnesia
otp_package: 21.3.8.6-1
preset: ldap_mnesia
db: mnesia
context: mongooseim-org
requires:
- otp_21_3
filters: *all_tags
# ============= DOCKER IMAGE BUILD & UPLOAD =============
- mim/docker_image:
name: docker_build_and_ship
context: mongooseim-org
otp_package: 22.1.8-1
requires:
- ldap_mnesia
- pgsql_mnesia
- riak_mnesia
- elasticsearch_and_cassandra
- internal_mnesia
- mysql_redis
- mssql_mnesia
- dialyzer
- small_tests_22
- small_tests_21_3
filters: *all_tags
#- mim/big_tests:
# name: ldap_mnesia
# otp_package: 21.3.8.6-1
# preset: ldap_mnesia
# db: mnesia
# context: mongooseim-org
# requires:
# - otp_21_3
# filters: *all_tags
## ============= DOCKER IMAGE BUILD & UPLOAD =============
#- mim/docker_image:
# name: docker_build_and_ship
# context: mongooseim-org
# otp_package: 22.1.8-1
# requires:
# - ldap_mnesia
# - pgsql_mnesia
# - riak_mnesia
# - elasticsearch_and_cassandra
# - internal_mnesia
# - mysql_redis
# - mssql_mnesia
# - dialyzer
# - small_tests_22
# - small_tests_21_3
# filters: *all_tags
5 changes: 2 additions & 3 deletions big_tests/test.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,8 @@
{outgoing_pools, "{outgoing_pools, [
{redis, global, global_distrib, [{workers, 10}], []},
{rdbms, global, default, [{workers, 5}],
[{server, {pgsql, \"localhost\", \"ejabberd\", \"ejabberd\", \"mongooseim_secret\",
[{ssl, required}, {ssl_opts, [{verify, verify_peer},
{cacertfile, \"priv/ssl/cacert.pem\"}, {server_name_indication, disable}]}]}}]}
[{server, {pgsql, \"localhost\", 5432, \"ejabberd\", \"ejabberd\", \"mongooseim_secret\"
}}]}
]}."},
{mod_last, "{mod_last, [{backend, rdbms}]},"},
{mod_privacy, "{mod_privacy, [{backend, rdbms}]},"},
Expand Down
6 changes: 4 additions & 2 deletions big_tests/tests/rdbms_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,8 @@ check_unicode(Config, Value) when is_binary(Value) ->
"VALUES (", use_escaped(Config, SValue), ")"],
SelectQuery = <<"SELECT unicode FROM test_types">>,
InsertResult = sql_query(Config, InsertQuery),
SelectResult = sql_query(Config, SelectQuery),
{selected, [{SelectedValue}]} = sql_query(Config, SelectQuery),
SelectResult = {selected, [{unescape_binary(<<>>, SelectedValue)}]},
%% Compare as binaries
?assert_equal_extra({selected, [{Value}]},
SelectResult,
Expand Down Expand Up @@ -419,7 +420,8 @@ check_ascii_string(Config, Value) when is_binary(Value) ->
"VALUES (", use_escaped(Config, SValue), ")"],
SelectQuery = <<"SELECT ascii_string FROM test_types">>,
InsertResult = sql_query(Config, InsertQuery),
SelectResult = sql_query(Config, SelectQuery),
{selected, [{SelectedValue}]} = sql_query(Config, SelectQuery),
SelectResult = {selected, [{unescape_binary(<<>>, SelectedValue)}]},
%% Compare as binaries
?assert_equal_extra({selected, [{Value}]},
SelectResult,
Expand Down
Loading