remove skip restart option and other small fixes
diff --git a/scripts/e2e-repeat.sh b/scripts/e2e-repeat.sh
index f34120b..be9a8f6 100755
--- a/scripts/e2e-repeat.sh
+++ b/scripts/e2e-repeat.sh
@@ -78,13 +78,19 @@
KEY_DIFFS=()
SIZE_DIFFS=()
LOG=$(mktemp)
+FIRST=1
while true; do
RUN_TS=$(date -u +%Y-%m-%dT%H:%M:%SZ)
echo "START RUN $RUN @ $RUN_TS" | tee -a $LOG
- DEPLOY_K8S=y WITH_BBSIM=y WITH_SADIS=y WITH_RADIUS=y ./voltha up
+ if [ $FIRST -eq 1 ]; then
+ DEPLOY_K8S=y WITH_BBSIM=y WITH_SADIS=y WITH_RADIUS=y CONFIG_SADIS=y ./voltha up
+ FIRST=0
+ else
+ helm install --wait -f full-values.yaml --set defaults.log_level=WARN --namespace voltha --name bbsim onf/bbsim
+ fi
# because BBSIM needs time
sleep 60
- ETCD=$(kubectl -n voltha get pods | grep etcd-cluster | awk '{print $1}')
+ ETCD=$(kubectl -n voltha get pods | grep etcd-cluster | awk '{print $1}' | head -1)
BEFORE_KEY_COUNT=$(kubectl -n voltha exec -ti $ETCD \
-- sh -c 'ETCDCTL_API=3 etcdctl get --command-timeout=60s --from-key=true --keys-only . | sed -e "/^$/d" | wc -l | tr -d "\r\n"')
BEFORE_SIZE=$(numfmt --to=iec \
diff --git a/scripts/etcd-db-size.sh b/scripts/etcd-db-size.sh
index 2c16966..befb6a8 100755
--- a/scripts/etcd-db-size.sh
+++ b/scripts/etcd-db-size.sh
@@ -17,7 +17,7 @@
set -o pipefail
-ETCD=$(kubectl -n voltha get pods 2>&1 | grep etcd-cluster | awk '{print $1}')
+ETCD=$(kubectl -n voltha get pods 2>&1 | grep etcd-cluster | awk '{print $1}' | head -1)
if [ -z "$ETCD" ]; then
echo "N/A"
else
diff --git a/scripts/monitor.sh b/scripts/monitor.sh
index 84a8cae..0a2bf47 100755
--- a/scripts/monitor.sh
+++ b/scripts/monitor.sh
@@ -16,7 +16,7 @@
# This script sets up a watch with information that is valuable when
# developing voltha with k8s
-watch '$HOME/kind-voltha/bin/kubectl get --all-namespaces pods,svc && echo "" \
+$HOME/kind-voltha/bin/kubectl get --all-namespaces pods,svc && echo "" \
&& kubectl describe --all-namespaces pods | grep Image: | grep voltha | sed -e "s/^ *//g" -e "s/: */: /g" && echo "" \
&& echo "DB SIZE: $(./scripts/etcd-db-size.sh)" && echo "" \
- && echo "RSS SIZE: $(ps -eo rss,pid,cmd | grep /usr/local/bin/etcd | grep -v grep | cut -d\ -f1 | numfmt --to=iec)"'
+ && echo "RSS SIZE: $(ps -eo rss,pid,cmd | grep /usr/local/bin/etcd | grep -v grep | cut -d\ -f1 | numfmt --to=iec | tr '\n' ' ' )"