remove all

src/install-edge-runtime.sh

@@ -77,8 +77,7 @@ function install_edge_runtime_dps() {
 
     if [ -x "$(command -v iotedge)" ];
     then
-        out=$(which docker)
-        log_error "Edge runtime is already available at %s." $out
+        log_error "Edge runtime is already available at ${BOLD}'%s'${DEFAULT}." $(which iotedge)
         exit ${EXIT_CODES[9]}
     fi
 

tests/e2e-tests/test-uninstall.sh

@@ -16,8 +16,15 @@
 
 #Question - is 'sudo' really needed here?
 #Answer   - it doesn't hurt!
+
+      sudo apt-get remove --purge aziot-edge aziot-identity-service -y
+      sudo docker rm $(sudo docker ps -a -q) > /dev/null 2>&1
+      sudo docker rmi -f $(sudo docker images -aq) /dev/null 2>&1
+      sudo apt-get remove --purge moby-cli moby-engine -y
+
+
 echo Uninstall Azure IoTEdge and its subs
-sudo apt-get remove --purge --auto-remove aziot-edge -y
+sudo apt-get remove --purge --autoremove aziot-edge aziot-identity-service -y
 
 echo Remove any dangling docker containers
 sudo docker rm $(sudo docker ps -a -q) > /dev/null 2>&1
@@ -26,7 +33,7 @@ echo Remove all docker images
 sudo docker rmi -f $(sudo docker images -aq) > /dev/null 2>&1
 
 echo Remove moby-engine and its subs
-sudo apt-get remove --purge --auto-remove moby-engine -y
+sudo apt-get remove --purge --autoremove moby-cli moby-engine -y
 
 echo Remove log, output and error files
 sudo rm -f /tmp/azure-iot-edge-installer*.* > /dev/null 2>&1

vsts_ci/continuous-e2e-uninstalledge.yml

@@ -8,9 +8,9 @@ steps:
     scriptType: 'bash'
     scriptLocation: 'inlineScript'
     inlineScript: |
-      sudo apt-get remove --purge --auto-remove aziot-edge -y
+      sudo apt-get remove --purge --autoremove aziot-edge aziot-identity-service -y
       sudo docker rm $(sudo docker ps -a -q) > /dev/null 2>&1
       sudo docker rmi -f $(sudo docker images -aq) > /dev/null 2>&1
-      sudo apt-get remove --purge --auto-remove moby-engine -y
+      sudo apt-get remove --purge --autoremove moby-cli moby-engine -y
       sudo rm -f /tmp/azure-iot-edge-installer*.* > /dev/null 2>&1
   displayName: 'Uninstall iotedge package from previous run'