Added Edgex Platform Test Script

Modified kubernetes_cleanup.sh to support non-root user
handling.

Script Added
1. verifyedgex.sh

Script Modified
1. kubernetes_cleanup.sh

Signed-off-by: abhijit_onap <abhijit.das.gupta@huawei.com>
Change-Id: Ie0c883fb740c903a84110b6afd315a6fff7eeb9c
Signed-off-by: abhijit_onap <abhijit.das.gupta@huawei.com>

diff --git a/scripts/edgex/verifyedgex.sh b/scripts/edgex/verifyedgex.sh
new file mode 100644 (file)
index 0000000..b1af3af
--- /dev/null
+++ b/scripts/edgex/verifyedgex.sh
@@ -0,0 +1,38 @@
+#!/bin/bash -ex
+
+##############################################################################
+# Copyright (c) 2019 Huawei Tech and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+# To verify edgex platform deployment on k8s.
+
+retrytimes=10
+while [ $retrytimes -gt 0 ]
+do
+ if [ 1 == "$(kubectl get pods | grep edgex-config-seed | grep -i completed | wc -l)" ]; then
+    break
+ fi
+ ((retrytimes-=1))
+ sleep 5
+done
+[ $retrytimes -gt 0 ] || exit 1
+
+# Reset the variable to check Running status of other edgex platform microservices
+
+retrytimes=20
+while [ $retrytimes -gt 0 ]
+do
+ if [ 12 == "$(kubectl get pods | grep edgex | grep Running | wc -l)" ]; then
+    echo "Edgex Platform is successfully deployed on ELIOT !!!!"
+    break
+ fi
+ ((retrytimes-=1))
+ sleep 5
+done
+[ $retrytimes -gt 0 ] || exit 1
+

diff --git a/scripts/kubernetes_cleanup.sh b/scripts/kubernetes_cleanup.sh
index 04e6abf..89d12e7 100644 (file)
--- a/scripts/kubernetes_cleanup.sh
+++ b/scripts/kubernetes_cleanup.sh
@@ -24,25 +24,41 @@ show_help()
 # Rollbacking the changes on ELIOT Manager Node
 rollback_k8smaster()
 {
-sudo apt-get install iptables
-sudo iptables -F && iptables -t nat -F && iptables -t mangle -F && iptables -X
-sudo apt-get install ipvsadm
-sudo fuser -k -n tcp 10250
-sudo yes y | apt-get purge -y docker-engine
-sudo yes y | apt-get purge -y docker
-sudo yes y | apt-get purge -y docker.io
-sudo yes y | apt-get purge -y docker-ce
-sudo yes y | apt-get purge -y docker-ce-cli
-sudo yes y | groupdel docker
-sudo yes y | kubeadm reset
-sudo yes y | apt-get purge kubeadm
-sudo yes y | apt-get purge kubectl
-sudo yes y | apt-get purge kubelet
-sudo yes y | apt-get purge kube*
-sudo yes y | apt-get purge kubernetes-cni
-sudo rm -rf ~/.kube
-sudo yes y | apt-get autoremove
-sudo yes y | apt-get autoclean
+if [ "$(id -u)" = 0 ]; then
+  sudo apt-get install iptables
+  sudo iptables -F && iptables -t nat -F && iptables -t mangle -F && iptables -X
+  sudo apt-get install ipvsadm
+  sudo fuser -k -n tcp 10250
+  sudo yes y | apt-get purge -y docker-engine
+  sudo yes y | apt-get purge -y docker
+  sudo yes y | apt-get purge -y docker.io
+  sudo yes y | apt-get purge -y docker-ce
+  sudo yes y | apt-get purge -y docker-ce-cli
+  sudo yes y | groupdel docker
+  sudo yes y | kubeadm reset
+  sudo yes y | apt-get purge kubeadm
+  sudo yes y | apt-get purge kubectl
+  sudo yes y | apt-get purge kubelet
+  sudo yes y | apt-get purge kube*
+  sudo yes y | apt-get purge kubernetes-cni
+  sudo rm -rf ~/.kube
+  sudo yes y | apt-get autoremove
+  sudo yes y | apt-get autoclean
+else
+  sudo fuser -k -n tcp 10250
+  sudo yes y | sudo apt-get purge -y docker-engine
+  sudo yes y | sudo apt-get purge -y docker
+  sudo yes y | sudo apt-get purge -y docker.io
+  sudo yes y | sudo apt-get purge -y docker-ce
+  sudo yes y | sudo apt-get purge -y docker-ce-cli
+  sudo yes y | sudo kubeadm reset
+  sudo yes y | sudo apt-get purge kubeadm
+  sudo yes y | sudo apt-get purge kubectl
+  sudo yes y | sudo apt-get purge kubelet
+  sudo yes y | sudo apt-get purge kube*
+  sudo yes y | sudo apt-get purge kubernetes-cni
+  sudo rm -rf ~/.kube
+fi
 
 rollback_k8sworkers
 
@@ -51,26 +67,43 @@ rollback_k8sworkers
 #Rollbacking the changes on ELIOT Worker Node
 rollback_k8sworkers()
 {
-INSTALL_IPVSADM="sudo apt-get install ipvsadm"
-RESET_PORT="fuser -k -n tcp 10250"
-#REMOVE_KUBE_FILES="cd /etc/kubernetes && sudo rm -rf !('manifests') "
-REMOVE_KUBE_FILES="cd /etc/kubernetes && sudo rm -rf bootstrap-kubelet.conf kubelet.conf pki"
-REMOVE_DOCKER1="sudo yes y | apt-get purge -y docker-engine"
-REMOVE_DOCKER2="sudo yes y | apt-get purge -y docker"
-REMOVE_DOCKER3="sudo yes y | apt-get purge -y docker.io"
-REMOVE_DOCKER4="sudo yes y | apt-get purge -y docker-ce"
-REMOVE_DOCKER5="sudo yes y | apt-get purge -y docker-ce-cli"
-REMOVE_DOCKER6="sudo yes y | groupdel docker"
-RESET_KUBEADM="sudo yes y | kubeadm reset"
-REMOVE_KUBE_FILES1="sudo yes y | apt-get purge kubeadm"
-REMOVE_KUBE_FILES2="sudo yes y | apt-get purge kubectl "
-REMOVE_KUBE_FILES3="sudo yes y | apt-get purge kubelet "
-REMOVE_KUBE_FILES4="sudo yes y | apt-get purge kube* "
-REMOVE_KUBE_FILES5="sudo yes y | apt-get purge kubernetes-cni"
-REMOVE_KUBE_FILES6="sudo rm -rf ~/.kube"
-AUTO_REMOVE="sudo yes y | apt-get autoremove"
-AUTO_CLEAN="sudo yes y | apt-get autoclean"
-
+if [ " $(id -u)" = 0]; then
+  INSTALL_IPVSADM="sudo apt-get install ipvsadm"
+  RESET_PORT="fuser -k -n tcp 10250"
+  #REMOVE_KUBE_FILES="cd /etc/kubernetes && sudo rm -rf !('manifests') "
+  REMOVE_KUBE_FILES="cd /etc/kubernetes && sudo rm -rf bootstrap-kubelet.conf kubelet.conf pki"
+  REMOVE_DOCKER1="sudo yes y | apt-get purge -y docker-engine"
+  REMOVE_DOCKER2="sudo yes y | apt-get purge -y docker"
+  REMOVE_DOCKER3="sudo yes y | apt-get purge -y docker.io"
+  REMOVE_DOCKER4="sudo yes y | apt-get purge -y docker-ce"
+  REMOVE_DOCKER5="sudo yes y | apt-get purge -y docker-ce-cli"
+  REMOVE_DOCKER6="sudo yes y | groupdel docker"
+  RESET_KUBEADM="sudo yes y | kubeadm reset"
+  REMOVE_KUBE_FILES1="sudo yes y | apt-get purge kubeadm"
+  REMOVE_KUBE_FILES2="sudo yes y | apt-get purge kubectl "
+  REMOVE_KUBE_FILES3="sudo yes y | apt-get purge kubelet "
+  REMOVE_KUBE_FILES4="sudo yes y | apt-get purge kube* "
+  REMOVE_KUBE_FILES5="sudo yes y | apt-get purge kubernetes-cni"
+  REMOVE_KUBE_FILES6="sudo rm -rf ~/.kube"
+  AUTO_REMOVE="sudo yes y | apt-get autoremove"
+  AUTO_CLEAN="sudo yes y | apt-get autoclean"
+else
+  RESET_PORT="fuser -k -n tcp 10250"
+  REMOVE_KUBE_FILES="cd /etc/kubernetes && sudo rm -rf bootstrap-kubelet.conf kubelet.conf pki"
+  REMOVE_DOCKER1="sudo yes y | sudo apt-get purge -y docker-engine"
+  REMOVE_DOCKER2="sudo yes y | sudo apt-get purge -y docker"
+  REMOVE_DOCKER3="sudo yes y | sudo apt-get purge -y docker.io"
+  REMOVE_DOCKER4="sudo yes y | sudo apt-get purge -y docker-ce"
+  REMOVE_DOCKER5="sudo yes y | sudo apt-get purge -y docker-ce-cli"
+  REMOVE_DOCKER6="sudo yes y | sudo groupdel docker"
+  RESET_KUBEADM="sudo yes y | sudo kubeadm reset"
+  REMOVE_KUBE_FILES1="sudo yes y | sudo apt-get purge kubeadm"
+  REMOVE_KUBE_FILES2="sudo yes y | sudo apt-get purge kubectl "
+  REMOVE_KUBE_FILES3="sudo yes y | sudo apt-get purge kubelet "
+  REMOVE_KUBE_FILES4="sudo yes y | sudo apt-get purge kube* "
+  REMOVE_KUBE_FILES5="sudo yes y | sudo apt-get purge kubernetes-cni"
+  REMOVE_KUBE_FILES6="sudo rm -rf ~/.kube"
+fi
 
 #Read all the Worker Node details from nodelist file.
  while read line