B fix no demo icons

ansible/inventory/local/group_vars/docker_deploy.yml

@@ -21,6 +21,7 @@ container_name: "dexterous_hand" # Name of the docker container
 nvidia_docker: false # Define if nvidia-container-toolkit is used (default is false)
 use_aws: false # Flag to prompt for customer key for uploading files to AWS
 shortcut_name: "Shadow_Hand_Launcher" # Specify the name for the desktop icon (default: Shadow_Hand_Launcher)
+no_icons: false # Set to true to disable all icons
 demo_icons: true # Generates desktop icons to run demos
 setup_directory: "/usr/local/bin" # Where setup scripts should be installed that are launched when Docker starts
 terminator: true # Launch terminator when the Docker starts
@@ -35,4 +36,4 @@ bag_all_data_from: ["shadowrobot_210312", "shadowrobot_210311", "shadowrobot_210
 pr_branches: "" # Space-separated list in double quotes of PRs and branches like this "https://github.com/shadow-robot/repo/pull/266 https://github.com/shadow-robot/repo/tree/custom_branch" to check out on server and catkin_make
 local_image: false # This boolean dictates if you want to use a local image or not. Skips all authentication checks and stops the image from being pulled.
 
-skip_molecule_task: false # Used for automated tests - should not be used by users
+skip_molecule_task: false # Used for automated tests - should not be used by users

ansible/inventory/server_and_nuc/group_vars/server.yml

@@ -23,6 +23,7 @@ shortcut_name: "Shadow_Hand_Launcher" # Specify the name for the desktop icon (d
 use_aws: false # Flag to prompt for customer key for uploading files to AWS
 setup_directory: "/usr/local/bin" # Where setup scripts should be installed that are launched when Docker starts
 terminator: true # Launch terminator when the Docker starts
+no_icons: false # Set to true to disable all icons
 sim_icon: true # creates an extra icon that runs hand in simulation mode
 save_nuc_logs: true # enables saving ROS logs from control-computer to server
 demo_icons: true # Generates desktop icons to run demos
@@ -42,4 +43,4 @@ scene_file: "" # Allows the user to override the scene_file used in GUI launch (
 delivery: true # This variable is used to determine whether we are using this for product delivery, or for development purposes. (should be used internally by Shadow Engineers)
 local_image: false # This boolean dictates if you want to use a local image or not. Skips all authentication checks and stops the image from being pulled.
 
-skip_molecule_task: false # Used for automated tests - should not be used by users
+skip_molecule_task: false # Used for automated tests - should not be used by users

ansible/inventory/teleop/group_vars/server.yml

@@ -26,6 +26,7 @@ use_openvpn: false # Specify if openvpn-server should be installed
 setup_directory: "/usr/local/bin" # Where setup scripts should be installed that are launched when Docker starts
 terminator: true # Launch terminator when the Docker starts
 use_steamvr: true # Determines if SteamVR will launch inside the container created on this machine
+no_icons: false # Set to true to disable all icons
 sim_icon: false # creates an extra icon that runs teleoperation in simulation mode
 save_nuc_logs: true # enables saving ROS logs from control-computer to server
 demo_icons: true # Generates desktop icons to run demos
@@ -47,4 +48,4 @@ la_tracker_id: 1 # Left tracker ID specified for haptx gloves (highest tracker s
 local_image: false # This boolean dictates if you want to use a local image or not. Skips all authentication checks and stops the image from being pulled.
 delivery: true # This variable is used to determine whether we are using this for product delivery, or for development purposes. (should be used internally by Shadow Engineers)
 
-skip_molecule_task: false # Used for automated tests - should not be used by users
+skip_molecule_task: false # Used for automated tests - should not be used by users

ansible/inventory/teleop/group_vars/simulation.yml

@@ -26,6 +26,7 @@ use_aws: false # Flag to prompt for customer key for uploading files to AWS
 setup_directory: "/usr/local/bin" # Where setup scripts should be installed that are launched when Docker starts
 terminator: true # Launch terminator when the Docker starts
 use_steamvr: false # Determines if SteamVR will launch inside the container created on this machine
+no_icons: false # Set to true to disable all icons
 demo_icons: true # Generates desktop icons to run demos
 upgrade_check: false # If set to true will pull latest docker image and prompt to upgrade the container
 ansible_become_password: "{{ sudo_password }}" # Specify the sudo password for the server laptop
@@ -37,4 +38,4 @@ scene_file: "" # Allows the user to override the scene_file used in GUI launch e
 local_image: false # This boolean dictates if you want to use a local image or not. Skips all authentication checks and stops the image from being pulled.
 delivery: true # This variable is used to determine whether we are using this for product delivery, or for development purposes. (should be used internally by Shadow Engineers)
 
-skip_molecule_task: false # Used for automated tests - should not be used by users
+skip_molecule_task: false # Used for automated tests - should not be used by users

ansible/playbooks/docker_deploy.yml

@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Shadow Robot Company Ltd.
+# Copyright 2022-2024 Shadow Robot Company Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the Free
@@ -40,4 +40,4 @@
   roles:
     - { role: products/common/get-system-variables }
     - { role: products/hand-e/docker-deploy/deploy }
-    - { role: products/common/dolphin-icons, when: ansible_distribution_release|string == 'focal' or ansible_distribution_release|string == 'jammy' }
+    - { role: products/common/dolphin-icons, when: (ansible_distribution_release|string == 'focal' or ansible_distribution_release|string == 'jammy') and not no_icons|bool}

ansible/playbooks/server_and_nuc_deploy.yml

@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Shadow Robot Company Ltd.
+# Copyright 2022-2024 Shadow Robot Company Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the Free
@@ -121,7 +121,7 @@
   roles:
     - { role: products/common/get-system-variables }
     - { role: products/hand-e/server/deploy }
-    - { role: products/common/dolphin-icons, when: ansible_distribution_release|string == 'focal' or ansible_distribution_release|string == 'jammy'}
+    - { role: products/common/dolphin-icons, when: (ansible_distribution_release|string == 'focal' or ansible_distribution_release|string == 'jammy') and not no_icons|bool}
 
 - name: Install Hand software on control machine
   hosts: control_machine

ansible/playbooks/teleop_deploy.yml

@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Shadow Robot Company Ltd.
+# Copyright 2022-2024 Shadow Robot Company Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the Free
@@ -120,7 +120,7 @@
   roles:
     - { role: products/common/get-system-variables }
     - { role: products/teleop/server/deploy }
-    - { role: products/common/dolphin-icons, when: ansible_distribution_release|string == 'focal' or ansible_distribution_release|string == 'jammy'}
+    - { role: products/common/dolphin-icons, when: (ansible_distribution_release|string == 'focal' or ansible_distribution_release|string == 'jammy') and not no_icons|bool}
 
 - name: Install Teleop simulation software on Ubuntu teleop server laptop
   hosts: simulation
@@ -157,7 +157,7 @@
   roles:
     - { role: products/common/get-system-variables }
     - { role: products/teleop/server/deploy }
-    - { role: products/common/dolphin-icons, when: ansible_distribution_release|string == 'focal' or ansible_distribution_release|string == 'jammy'}
+    - { role: products/common/dolphin-icons, when: (ansible_distribution_release|string == 'focal' or ansible_distribution_release|string == 'jammy') and not no_icons|bool}
 
 - name: Install Teleop software on control machine
   hosts: control_machine