[arvados] updated: 2.7.0-6184-g8b5d03935a

git repository hosting git at public.arvados.org
Thu Mar 14 20:54:30 UTC 2024


Summary of changes:
 .../multiple_hostnames}/states/workbench1_uninstall.sls                  | 0
 .../aws => single_host/single_hostname}/states/workbench1_uninstall.sls  | 0
 tools/salt-install/provision.sh                                          | 1 +
 3 files changed, 1 insertion(+)
 copy tools/salt-install/config_examples/{multi_host/aws => single_host/multiple_hostnames}/states/workbench1_uninstall.sls (100%)
 copy tools/salt-install/config_examples/{multi_host/aws => single_host/single_hostname}/states/workbench1_uninstall.sls (100%)

       via  8b5d03935a661e80caf353fdff8b8b998d702e27 (commit)
      from  44f003133c3c8eec7baca6999c199b7fc1646fdc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 8b5d03935a661e80caf353fdff8b8b998d702e27
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Thu Mar 14 17:54:02 2024 -0300

    21165: Uninstalls WB1 from single host installations too.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/states/workbench1_uninstall.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/states/workbench1_uninstall.sls
new file mode 100644
index 0000000000..02ac0af640
--- /dev/null
+++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/states/workbench1_uninstall.sls
@@ -0,0 +1,12 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+{%- set curr_tpldir = tpldir %}
+{%- set tpldir = 'arvados' %}
+{%- from "arvados/map.jinja" import arvados with context %}
+{%- set tpldir = curr_tpldir %}
+
+workbench1_pkg_removed:
+  pkg.removed:
+    - name: {{ arvados.workbench.pkg.name }}
\ No newline at end of file
diff --git a/tools/salt-install/config_examples/single_host/single_hostname/states/workbench1_uninstall.sls b/tools/salt-install/config_examples/single_host/single_hostname/states/workbench1_uninstall.sls
new file mode 100644
index 0000000000..02ac0af640
--- /dev/null
+++ b/tools/salt-install/config_examples/single_host/single_hostname/states/workbench1_uninstall.sls
@@ -0,0 +1,12 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+{%- set curr_tpldir = tpldir %}
+{%- set tpldir = 'arvados' %}
+{%- from "arvados/map.jinja" import arvados with context %}
+{%- set tpldir = curr_tpldir %}
+
+workbench1_pkg_removed:
+  pkg.removed:
+    - name: {{ arvados.workbench.pkg.name }}
\ No newline at end of file
diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index 1c3a37fd53..8dd07020c3 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -615,6 +615,7 @@ if [ -z "${ROLES:-}" ]; then
   echo "    - extra.shell_sudo_passwordless" >> ${STATES_TOP}
   echo "    - extra.shell_cron_add_login_sync" >> ${STATES_TOP}
   echo "    - extra.passenger_rvm" >> ${STATES_TOP}
+  echo "    - extra.workbench1_uninstall" >> ${STATES_TOP}
 
   # Pillars
   echo "    - docker" >> ${PILLARS_TOP}

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list