Don't override included overlay vars #3794
Conversation
|
ldap_mnesia_24 / ldap_mnesia / 74465ea pgsql_mnesia_24 / pgsql_mnesia / 74465ea riak_mnesia_24 / riak_mnesia / 74465ea dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 74465ea internal_mnesia_25 / internal_mnesia / 74465ea mysql_redis_25 / mysql_redis / 74465ea ldap_mnesia_25 / ldap_mnesia / 74465ea dynamic_domains_mysql_redis_25 / mysql_redis / 74465ea elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / 74465ea dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 74465ea mssql_mnesia_25 / odbc_mssql_mnesia / 74465ea pgsql_mnesia_25 / pgsql_mnesia / 74465ea small_tests_24 / small_tests / 74465ea small_tests_25 / small_tests / 74465ea |
Codecov ReportBase: 82.92% // Head: 82.88% // Decreases project coverage by
Additional details and impacted files@@ Coverage Diff @@
## master #3794 +/- ##
==========================================
- Coverage 82.92% 82.88% -0.05%
==========================================
Files 529 529
Lines 33810 33810
==========================================
- Hits 28038 28022 -16
- Misses 5772 5788 +16
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
chrzaszcz
force-pushed
the
vars-without-overriding
branch
from
74465ea to
b3dad82
Compare
|
small_tests_24 / small_tests / b3dad82 small_tests_25 / small_tests / b3dad82 dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / b3dad82 ldap_mnesia_24 / ldap_mnesia / b3dad82 ldap_mnesia_25 / ldap_mnesia / b3dad82 dynamic_domains_mysql_redis_25 / mysql_redis / b3dad82 muc_SUITE:hibernation:hibernated_room_can_be_queried_for_archive{error,{{assertion_failed,assert,is_groupchat_message,
[<<"Restorable message">>],
undefined,"undefined"},
[{escalus_new_assert,assert_true,2,
[{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
{line,84}]},
{muc_SUITE,wait_for_mam_result,3,
[{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
{line,4394}]},
{muc_SUITE,'-hibernated_room_can_be_queried_for_archive/1-fun-0-',3,
[{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
{line,4130}]},
{escalus_story,story,4,
[{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
{line,72}]},
{muc_SUITE,hibernated_room_can_be_queried_for_archive,1,
[{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
{line,4126}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1291}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1223}]}]}}dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / b3dad82 pgsql_mnesia_24 / pgsql_mnesia / b3dad82 internal_mnesia_25 / internal_mnesia / b3dad82 elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / b3dad82 dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / b3dad82 pgsql_mnesia_25 / pgsql_mnesia / b3dad82 riak_mnesia_24 / riak_mnesia / b3dad82 mysql_redis_25 / mysql_redis / b3dad82 mssql_mnesia_25 / odbc_mssql_mnesia / b3dad82 pep_SUITE:pep_tests:unsubscribe_after_presence_unsubscription{error,
{{badmatch,
[{xmlel,<<"message">>,
[{<<"from">>,
<<"alice_unsubscribe_after_presence_unsubscription_2463@localhost">>},
{<<"to">>,
<<"bob_unsubscribe_after_presence_unsubscription_2463@localhost/res1">>},
{<<"type">>,<<"headline">>}],
[{xmlel,<<"event">>,
[{<<"xmlns">>,
<<"http://jabber.org/protocol/pubsub#event">>}],
[{xmlel,<<"items">>,
[{<<"node">>,<<"UfJ/d2UN3mqGP0OE3FLsWw==">>}],
[{xmlel,<<"item">>,
[{<<"id">>,<<"salmon">>}],
[{xmlel,<<"entry">>,
[{<<"xmlns">>,
<<"http://www.w3.org/2005/Atom">>}],
[]}]}]}]},
{xmlel,<<"headers">>,
[{<<"xmlns">>,<<"http://jabber.org/protocol/shim">>}],
[]}]}]},
[{pep_SUITE,'-unsubscribe_after_presence_unsubscription/1-fun-0-',2,
[{file,"/home/circleci/project/big_tests/tests/pep_SUITE.erl"},
{line,384}]},
{escalus_story,story,4,
[{file,
"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
{line,72}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1291}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1223}]}]}} |
chrzaszcz
force-pushed
the
vars-without-overriding
branch
from
b3dad82 to
9000f5a
Compare
|
small_tests_24 / small_tests / 9000f5a small_tests_25 / small_tests / 9000f5a ldap_mnesia_24 / ldap_mnesia / 9000f5a dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 9000f5a ldap_mnesia_25 / ldap_mnesia / 9000f5a dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 9000f5a dynamic_domains_mysql_redis_25 / mysql_redis / 9000f5a internal_mnesia_25 / internal_mnesia / 9000f5a dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 9000f5a elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / 9000f5a pgsql_mnesia_24 / pgsql_mnesia / 9000f5a pgsql_mnesia_25 / pgsql_mnesia / 9000f5a mysql_redis_25 / mysql_redis / 9000f5a mssql_mnesia_25 / odbc_mssql_mnesia / 9000f5a inbox_extensions_SUITE:async_pools:one_to_one:mute_muted_entry_gets_unmuted{error,
{{assert,
[{module,inbox_extensions_SUITE},
{line,798},
{expression,"escalus_pred : is_message ( Message )"},
{expected,true},
{value,false}]},
[{inbox_extensions_SUITE,check_message_with_properties,4,
[{file,
"/home/circleci/project/big_tests/tests/inbox_extensions_SUITE.erl"},
{line,798}]},
{inbox_extensions_SUITE,set_inbox_properties,4,
[{file,
"/home/circleci/project/big_tests/tests/inbox_extensions_SUITE.erl"},
{line,792}]},
{inbox_extensions_SUITE,'-mute_muted_entry_gets_unmuted/1-fun-2-',2,
[{file,
"/home/circleci/project/big_tests/tests/inbox_extensions_SUITE.erl"},
{line,568}]},
{escalus_story,story,4,
[{file,
"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
{line,72}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1291}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1223}]}]}}riak_mnesia_24 / riak_mnesia / 9000f5a mssql_mnesia_25 / odbc_mssql_mnesia / 9000f5a rest_client_SUITE:roster:add_contact_and_invite{error,
{timeout_when_waiting_for_stanza,
[{escalus_client,wait_for_stanza,
[{client,<<"bob_add_contact_and_invite_2840@localhost/res1">>,
escalus_tcp,<0.29887.2>,
[{event_manager,<0.29847.2>},
{server,<<"localhost">>},
{username,<<"bOb_add_contact_and_invite_2840">>},
{resource,<<"res1">>}],
[{event_client,
[{event_manager,<0.29847.2>},
{server,<<"localhost">>},
{username,<<"bOb_add_contact_and_invite_2840">>},
{resource,<<"res1">>}]},
{resource,<<"res1">>},
{username,<<"bob_add_contact_and_invite_2840">>},
{server,<<"localhost">>},
{host,<<"localhost">>},
{port,5222},
{auth,{escalus_auth,auth_plain}},
{wspath,undefined},
{username,<<"bOb_add_contact_and_invite_2840">>},
{server,<<"localhost">>},
{password,<<"makrolika">>},
{stream_id,<<"4c4948c1ec0fbd13">>}]},
5000],
[{file,
"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
{line,136}]},
{rest_client_SUITE,'-add_contact_and_invite/1-fun-0-',2,
[{file,
"/home/circleci/project/big_tests/tests/rest_client_SUITE.erl"},
{line,1098}]},
{escalus_story,story,4,
[{file,
"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
{line,72}...mssql_mnesia_25 / odbc_mssql_mnesia / 9000f5a |
chrzaszcz
force-pushed
the
vars-without-overriding
branch
from
9000f5a to
71ebcc8
Compare
|
small_tests_24 / small_tests / 71ebcc8 small_tests_25 / small_tests / 71ebcc8 ldap_mnesia_24 / ldap_mnesia / 71ebcc8 dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 71ebcc8 dynamic_domains_mysql_redis_25 / mysql_redis / 71ebcc8 ldap_mnesia_25 / ldap_mnesia / 71ebcc8 dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 71ebcc8 internal_mnesia_25 / internal_mnesia / 71ebcc8 elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / 71ebcc8 dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 71ebcc8 pgsql_mnesia_24 / pgsql_mnesia / 71ebcc8 pgsql_mnesia_25 / pgsql_mnesia / 71ebcc8 riak_mnesia_24 / riak_mnesia / 71ebcc8 mssql_mnesia_25 / odbc_mssql_mnesia / 71ebcc8 muc_SUITE:hibernation:hibernated_room_can_be_queried_for_archive{error,{{assertion_failed,assert,is_groupchat_message,
[<<"Restorable message">>],
undefined,"undefined"},
[{escalus_new_assert,assert_true,2,
[{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
{line,84}]},
{muc_SUITE,wait_for_mam_result,3,
[{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
{line,4394}]},
{muc_SUITE,'-hibernated_room_can_be_queried_for_archive/1-fun-0-',3,
[{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
{line,4130}]},
{escalus_story,story,4,
[{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
{line,72}]},
{muc_SUITE,hibernated_room_can_be_queried_for_archive,1,
[{file,"/home/circleci/project/big_tests/tests/muc_SUITE.erl"},
{line,4126}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1291}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1223}]}]}}mysql_redis_25 / mysql_redis / 71ebcc8 mssql_mnesia_25 / odbc_mssql_mnesia / 71ebcc8 |
chrzaszcz
force-pushed
the
vars-without-overriding
branch
from
71ebcc8 to
f5a7082
Compare
They are documented, and the user could define them with different values if necessary.
There is an issue with the overriding logic in relx: included vars override previously defined ones, but there is no simple way of overriding the included vars other than including another file. This way making the dev releases resulted in incorrect vars. Big tests succeeded because they had their own overriding logic. It seems that we could do without overriding entirely, and this change shows that the resulting files are actually more straightforward.
chrzaszcz
force-pushed
the
vars-without-overriding
branch
from
f5a7082 to
9530b2a
Compare
|
small_tests_24 / small_tests / 9530b2a small_tests_25 / small_tests / 9530b2a ldap_mnesia_24 / ldap_mnesia / 9530b2a dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 9530b2a ldap_mnesia_25 / ldap_mnesia / 9530b2a dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 9530b2a dynamic_domains_mysql_redis_25 / mysql_redis / 9530b2a internal_mnesia_25 / internal_mnesia / 9530b2a elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / 9530b2a pgsql_mnesia_24 / pgsql_mnesia / 9530b2a dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 9530b2a pgsql_mnesia_25 / pgsql_mnesia / 9530b2a riak_mnesia_24 / riak_mnesia / 9530b2a mysql_redis_25 / mysql_redis / 9530b2a mssql_mnesia_25 / odbc_mssql_mnesia / 9530b2a pep_SUITE:pep_tests:unsubscribe_after_presence_unsubscription{error,
{{badmatch,
[{xmlel,<<"message">>,
[{<<"from">>,
<<"alice_unsubscribe_after_presence_unsubscription_2489@localhost">>},
{<<"to">>,
<<"bob_unsubscribe_after_presence_unsubscription_2489@localhost/res1">>},
{<<"type">>,<<"headline">>}],
[{xmlel,<<"event">>,
[{<<"xmlns">>,
<<"http://jabber.org/protocol/pubsub#event">>}],
[{xmlel,<<"items">>,
[{<<"node">>,<<"e00wGw57HmOllUNooiKgoA==">>}],
[{xmlel,<<"item">>,
[{<<"id">>,<<"salmon">>}],
[{xmlel,<<"entry">>,
[{<<"xmlns">>,
<<"http://www.w3.org/2005/Atom">>}],
[]}]}]}]},
{xmlel,<<"headers">>,
[{<<"xmlns">>,<<"http://jabber.org/protocol/shim">>}],
[]}]}]},
[{pep_SUITE,'-unsubscribe_after_presence_unsubscription/1-fun-0-',2,
[{file,"/home/circleci/project/big_tests/tests/pep_SUITE.erl"},
{line,384}]},
{escalus_story,story,4,
[{file,
"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
{line,72}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1291}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1223}]}]}} |
There was a problem hiding this comment.
Not sure I understand correctly. You moved the ./vars-toml.config file to the bottom, so variables defined there will override those in the per-node config, right? But in that case ./vars-toml.config defines for example node_name, and c2s_port, so it'd override those defined in all other configs. Am I understanding something the other way around? 🤔
|
The point of this PR is to avoid overriding variables - nothing is overridden now.
After the change |
There is an issue with the overriding logic in
relx: included vars override previously defined ones, but there is no simpleway of overriding the included vars other than including another file. This way making the
devreleases resulted in incorrect vars.Big tests succeeded because they had their own overriding logic.
This change ensures that no vars are overridden. The included file is always at the bottom, and in this case both
relxand our templating scripts work the same (included vars override the previous ones).Another changes:
mim2node for consistency.Possible further improvements:
relxwith a more intuitive and useful overriding logic.