diff --git a/shelltests/run_tests.sh b/shelltests/run_tests.sh index 88efd3d7a..43d86a8c8 100755 --- a/shelltests/run_tests.sh +++ b/shelltests/run_tests.sh @@ -17,7 +17,8 @@ pushd "${rebar3_dir}" git clone https://github.com/erlang/rebar3 . mkdir _checkouts ln -s "$current_dir/../../relx" _checkouts/relx -sed -i 's_relx\(.*\)build/default/lib/_relx\1checkouts_' rebar.config +sed -i.bak 's_relx\(.*\)build/default/lib/_relx\1checkouts_' rebar.config +rm rebar.config.bak ./bootstrap popd diff --git a/shelltests/upgrade_test/.gitignore b/shelltests/upgrade_test/.gitignore new file mode 100644 index 000000000..f1c455451 --- /dev/null +++ b/shelltests/upgrade_test/.gitignore @@ -0,0 +1,19 @@ +.rebar3 +_* +.eunit +*.o +*.beam +*.plt +*.swp +*.swo +.erlang.cookie +ebin +log +erl_crash.dump +.rebar +logs +_build +.idea +*.iml +rebar3.crashdump +*~ diff --git a/shelltests/upgrade_test/LICENSE b/shelltests/upgrade_test/LICENSE new file mode 100644 index 000000000..a6a7631fa --- /dev/null +++ b/shelltests/upgrade_test/LICENSE @@ -0,0 +1,191 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright 2022, Anonymous . + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/shelltests/upgrade_test/README.md b/shelltests/upgrade_test/README.md new file mode 100644 index 000000000..1b1a1ad87 --- /dev/null +++ b/shelltests/upgrade_test/README.md @@ -0,0 +1,9 @@ +upgrade_test +===== + +An OTP application + +Build +----- + + $ rebar3 compile diff --git a/shelltests/upgrade_test/apps/upgrade_test/ebin/upgrade_test.appup b/shelltests/upgrade_test/apps/upgrade_test/ebin/upgrade_test.appup new file mode 100644 index 000000000..b2f3fe54d --- /dev/null +++ b/shelltests/upgrade_test/apps/upgrade_test/ebin/upgrade_test.appup @@ -0,0 +1,3 @@ +{"0.1.0", + [{<<".*">>, [{restart_application, upgrade_test}]}], + [{<<".*">>, [{restart_application, upgrade_test}]}]}. diff --git a/shelltests/upgrade_test/apps/upgrade_test/src/upgrade_test.app.src b/shelltests/upgrade_test/apps/upgrade_test/src/upgrade_test.app.src new file mode 100644 index 000000000..e1c86b6de --- /dev/null +++ b/shelltests/upgrade_test/apps/upgrade_test/src/upgrade_test.app.src @@ -0,0 +1,15 @@ +{application, upgrade_test, + [{description, "An OTP application"}, + {vsn, "0.1.0"}, + {registered, []}, + {mod, {upgrade_test_app, []}}, + {applications, + [kernel, + stdlib + ]}, + {env,[]}, + {modules, []}, + + {licenses, ["Apache 2.0"]}, + {links, []} + ]}. diff --git a/shelltests/upgrade_test/apps/upgrade_test/src/upgrade_test_app.erl b/shelltests/upgrade_test/apps/upgrade_test/src/upgrade_test_app.erl new file mode 100644 index 000000000..22cd029b1 --- /dev/null +++ b/shelltests/upgrade_test/apps/upgrade_test/src/upgrade_test_app.erl @@ -0,0 +1,18 @@ +%%%------------------------------------------------------------------- +%% @doc upgrade_test public API +%% @end +%%%------------------------------------------------------------------- + +-module(upgrade_test_app). + +-behaviour(application). + +-export([start/2, stop/1]). + +start(_StartType, _StartArgs) -> + upgrade_test_sup:start_link(). + +stop(_State) -> + ok. + +%% internal functions diff --git a/shelltests/upgrade_test/apps/upgrade_test/src/upgrade_test_sup.erl b/shelltests/upgrade_test/apps/upgrade_test/src/upgrade_test_sup.erl new file mode 100644 index 000000000..be26609bc --- /dev/null +++ b/shelltests/upgrade_test/apps/upgrade_test/src/upgrade_test_sup.erl @@ -0,0 +1,35 @@ +%%%------------------------------------------------------------------- +%% @doc upgrade_test top level supervisor. +%% @end +%%%------------------------------------------------------------------- + +-module(upgrade_test_sup). + +-behaviour(supervisor). + +-export([start_link/0]). + +-export([init/1]). + +-define(SERVER, ?MODULE). + +start_link() -> + supervisor:start_link({local, ?SERVER}, ?MODULE, []). + +%% sup_flags() = #{strategy => strategy(), % optional +%% intensity => non_neg_integer(), % optional +%% period => pos_integer()} % optional +%% child_spec() = #{id => child_id(), % mandatory +%% start => mfargs(), % mandatory +%% restart => restart(), % optional +%% shutdown => shutdown(), % optional +%% type => worker(), % optional +%% modules => modules()} % optional +init([]) -> + SupFlags = #{strategy => one_for_all, + intensity => 0, + period => 1}, + ChildSpecs = [], + {ok, {SupFlags, ChildSpecs}}. + +%% internal functions diff --git a/shelltests/upgrade_test/apps011/upgrade_test/ebin/upgrade_test.appup b/shelltests/upgrade_test/apps011/upgrade_test/ebin/upgrade_test.appup new file mode 100644 index 000000000..e218a84ea --- /dev/null +++ b/shelltests/upgrade_test/apps011/upgrade_test/ebin/upgrade_test.appup @@ -0,0 +1,3 @@ +{"0.1.1", + [{<<".*">>, [{restart_application, upgrade_test}]}], + [{<<".*">>, [{restart_application, upgrade_test}]}]}. diff --git a/shelltests/upgrade_test/apps011/upgrade_test/src/upgrade_test.app.src b/shelltests/upgrade_test/apps011/upgrade_test/src/upgrade_test.app.src new file mode 100644 index 000000000..90d038415 --- /dev/null +++ b/shelltests/upgrade_test/apps011/upgrade_test/src/upgrade_test.app.src @@ -0,0 +1,15 @@ +{application, upgrade_test, + [{description, "An OTP application"}, + {vsn, "0.1.1"}, + {registered, []}, + {mod, {upgrade_test_app, []}}, + {applications, + [kernel, + stdlib + ]}, + {env,[]}, + {modules, []}, + + {licenses, ["Apache 2.0"]}, + {links, []} + ]}. diff --git a/shelltests/upgrade_test/apps011/upgrade_test/src/upgrade_test_app.erl b/shelltests/upgrade_test/apps011/upgrade_test/src/upgrade_test_app.erl new file mode 100644 index 000000000..22cd029b1 --- /dev/null +++ b/shelltests/upgrade_test/apps011/upgrade_test/src/upgrade_test_app.erl @@ -0,0 +1,18 @@ +%%%------------------------------------------------------------------- +%% @doc upgrade_test public API +%% @end +%%%------------------------------------------------------------------- + +-module(upgrade_test_app). + +-behaviour(application). + +-export([start/2, stop/1]). + +start(_StartType, _StartArgs) -> + upgrade_test_sup:start_link(). + +stop(_State) -> + ok. + +%% internal functions diff --git a/shelltests/upgrade_test/apps011/upgrade_test/src/upgrade_test_sup.erl b/shelltests/upgrade_test/apps011/upgrade_test/src/upgrade_test_sup.erl new file mode 100644 index 000000000..be26609bc --- /dev/null +++ b/shelltests/upgrade_test/apps011/upgrade_test/src/upgrade_test_sup.erl @@ -0,0 +1,35 @@ +%%%------------------------------------------------------------------- +%% @doc upgrade_test top level supervisor. +%% @end +%%%------------------------------------------------------------------- + +-module(upgrade_test_sup). + +-behaviour(supervisor). + +-export([start_link/0]). + +-export([init/1]). + +-define(SERVER, ?MODULE). + +start_link() -> + supervisor:start_link({local, ?SERVER}, ?MODULE, []). + +%% sup_flags() = #{strategy => strategy(), % optional +%% intensity => non_neg_integer(), % optional +%% period => pos_integer()} % optional +%% child_spec() = #{id => child_id(), % mandatory +%% start => mfargs(), % mandatory +%% restart => restart(), % optional +%% shutdown => shutdown(), % optional +%% type => worker(), % optional +%% modules => modules()} % optional +init([]) -> + SupFlags = #{strategy => one_for_all, + intensity => 0, + period => 1}, + ChildSpecs = [], + {ok, {SupFlags, ChildSpecs}}. + +%% internal functions diff --git a/shelltests/upgrade_test/config/sys.config b/shelltests/upgrade_test/config/sys.config new file mode 100644 index 000000000..3c5bcb972 --- /dev/null +++ b/shelltests/upgrade_test/config/sys.config @@ -0,0 +1,3 @@ +[ + {upgrade_test, []} +]. diff --git a/shelltests/upgrade_test/config/vm.args b/shelltests/upgrade_test/config/vm.args new file mode 100644 index 000000000..082273843 --- /dev/null +++ b/shelltests/upgrade_test/config/vm.args @@ -0,0 +1,6 @@ +-sname upgrade_test + +-setcookie upgrade_test_cookie + ++K true ++A30 diff --git a/shelltests/upgrade_test/rebar.config b/shelltests/upgrade_test/rebar.config new file mode 100644 index 000000000..79d91aa29 --- /dev/null +++ b/shelltests/upgrade_test/rebar.config @@ -0,0 +1,32 @@ +{erl_opts, [debug_info]}. +{deps, []}. + +{relx, [{release, {upgrade_test, "0.1.0"}, + [upgrade_test, + sasl]}, + + {mode, dev}, + + %% automatically picked up if the files + %% exist but can be set manually, which + %% is required if the names aren't exactly + %% sys.config and vm.args + {sys_config, "./config/sys.config"}, + {vm_args, "./config/vm.args"} + + %% the .src form of the configuration files do + %% not require setting RELX_REPLACE_OS_VARS + %% {sys_config_src, "./config/sys.config.src"}, + %% {vm_args_src, "./config/vm.args.src"} +]}. + +{profiles, [{prod, [{relx, + [%% prod is the default mode when prod + %% profile is used, so does not have + %% to be explicitly included like this + {mode, prod} + + %% use minimal mode to exclude ERTS + %% {mode, minimal} + ] + }]}]}. diff --git a/shelltests/upgrade_test/rebar.config011 b/shelltests/upgrade_test/rebar.config011 new file mode 100644 index 000000000..fc67bd9e0 --- /dev/null +++ b/shelltests/upgrade_test/rebar.config011 @@ -0,0 +1,38 @@ +{erl_opts, [debug_info]}. +{deps, []}. + +{project_app_dirs, ["apps011/*"]}. + + +{relx, [{release, {upgrade_test, "0.1.0"}, + [upgrade_test, + sasl]}, + {release, {upgrade_test, "0.1.1"}, + [upgrade_test, + sasl]}, + + {mode, dev}, + + %% automatically picked up if the files + %% exist but can be set manually, which + %% is required if the names aren't exactly + %% sys.config and vm.args + {sys_config, "./config/sys.config"}, + {vm_args, "./config/vm.args"} + + %% the .src form of the configuration files do + %% not require setting RELX_REPLACE_OS_VARS + %% {sys_config_src, "./config/sys.config.src"}, + %% {vm_args_src, "./config/vm.args.src"} +]}. + +{profiles, [{prod, [{relx, + [%% prod is the default mode when prod + %% profile is used, so does not have + %% to be explicitly included like this + {mode, prod} + + %% use minimal mode to exclude ERTS + %% {mode, minimal} + ] + }]}]}. diff --git a/shelltests/upgrade_test/upgrade_test.test b/shelltests/upgrade_test/upgrade_test.test new file mode 100644 index 000000000..414349136 --- /dev/null +++ b/shelltests/upgrade_test/upgrade_test.test @@ -0,0 +1,90 @@ +# create 0.1.0 tar archive and then the 0.1.1 tar +# +# +$ rebar3 as prod tar +> / Release successfully assembled: / +>= 0 + +$ REBAR_CONFIG=rebar.config011 rebar3 as prod release -v 0.1.1 +> / Release successfully assembled: / +>= 0 + +$ REBAR_CONFIG=rebar.config011 rebar3 as prod relup -n upgrade_test -v 0.1.1 -u 0.1.0 +> / Release successfully assembled: / +>= 0 + +$ REBAR_CONFIG=rebar.config011 rebar3 as prod tar -v 0.1.1 +> / Release successfully assembled: / +>= 0 + + +# +# extract 0.1.0 into _build/n, start node and check versions +# + +$ mkdir -p _build/n +>= 0 + +$ tar -C _build/n -xf ./_build/prod/rel/upgrade_test/upgrade_test-0.1.0.tar.gz +>= 0 + +$ _build/n/bin/upgrade_test daemon +>= 0 + +$ sleep 1 +>= 0 + +$ _build/n/bin/upgrade_test versions +> +Installed versions: +* 0.1.0 permanent +>= 0 + +# +# unpack 0.1.1 and check versions +# + +$ cp _build/prod/rel/upgrade_test/upgrade_test-0.1.1.tar.gz _build/n/releases/ +>= 0 + +$ _build/n/bin/upgrade_test unpack 0.1.1 +> +Release 0.1.1 not found, attempting to unpack releases/upgrade_test-0.1.1.tar.gz +Unpacked successfully: "0.1.1" +>= 0 + +$ _build/n/bin/upgrade_test versions +> +Installed versions: +* 0.1.1 unpacked +* 0.1.0 permanent +>= 0 + +# +# upgrade to 0.1.1 and check versions +# +$ _build/n/bin/upgrade_test upgrade 0.1.1 +> +Release 0.1.1 is already unpacked, now installing. +Installed Release: 0.1.1 +Made release permanent: "0.1.1" +>= + +$ _build/n/bin/upgrade_test versions +> +Installed versions: +* 0.1.1 permanent +* 0.1.0 old +>= 0 + +# +# stop node and remove _build/n +# +$ _build/n/bin/upgrade_test stop +>=0 + +$ sleep 2 +>=0 + +$ rm -rf _build/n +>=0