From ecb7a44eb1690d6860bf6bc49719f7cbdc743bd2 Mon Sep 17 00:00:00 2001 From: Fabio Buso Date: Tue, 26 Sep 2023 22:50:48 +0200 Subject: [PATCH] =?UTF-8?q?[HWORKS-762]=20Don't=20try=20to=20undeploy=20ho?= =?UTF-8?q?psworks-*=20current=5Fversion=20if=20it'=E2=80=A6=20(#1055)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [HWORKS-762] Don't try to undeploy hopsworks-* current_version if it's not deployed --- recipes/default.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/recipes/default.rb b/recipes/default.rb index c8dc19275..9aefc8b7d 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -374,6 +374,11 @@ keep_state true enabled true secure true +<<<<<<< Updated upstream + only_if "#{asadmin_cmd} list-applications --type ejb #{deployment_group} | grep -w \"hopsworks-ear:#{node['hopsworks']['current_version']}\"" +======= + only_if "#{asadmin_cmd} list-applications --type ejb domain | grep -w \"hopsworks-ear:#{node['hopsworks']['current_version']}\"" +>>>>>>> Stashed changes end glassfish_deployable "hopsworks" do @@ -391,6 +396,7 @@ retries 1 keep_state true enabled true + only_if "#{asadmin_cmd} list-applications --type web domain | grep -w \"hopsworks-web:#{node['hopsworks']['current_version']}\"" end glassfish_deployable "hopsworks-ca" do @@ -408,6 +414,7 @@ retries 1 keep_state true enabled true + only_if "#{asadmin_cmd} list-applications --type ejb domain | grep -w \"hopsworks-ca:#{node['hopsworks']['current_version']}\"" end end