From: catalin iova <catalin.iova@enea.com>
Date: Thu, 9 Apr 2020 08:43:46 +0000 (+0300)
Subject: Change seba installation for cord 7.0.0
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=ca97a83a42facfde1c43cbc4714e663d064256c8;p=iec.git

Change seba installation for cord 7.0.0

JIRA: IEC-37

Change-Id: Ia4dcc206967a99b31991f3247b9d1326b21fdf25
Signed-off-by: CATALIN IOVA <CATALIN.IOVA@enea.com>
---

diff --git a/src/use_cases/seba_on_arm/install/README b/src/use_cases/seba_on_arm/install/README
index 9a389a7..5ae0c60 100644
--- a/src/use_cases/seba_on_arm/install/README
+++ b/src/use_cases/seba_on_arm/install/README
@@ -16,3 +16,7 @@ SEBA on Arm Installation Guide
    For a known Kubernetes issues, you may need to add to the node you would like to access:
    $sudo iptables -A FORWARD -j ACCEPT
    if you can only access the GUI from the node where xos-gui pod runs.
+
+NOTE: install.sh is a symbolic link of one of the files:
+      1. install-cord-6.1.0.sh is using cord-platform-6.1.0
+      2. ../test/ponsim/install.sh is using cord-platform-7.0.0
diff --git a/src/use_cases/seba_on_arm/install/install-cord-6.1.0.sh b/src/use_cases/seba_on_arm/install/install-cord-6.1.0.sh
new file mode 100755
index 0000000..f489c03
--- /dev/null
+++ b/src/use_cases/seba_on_arm/install/install-cord-6.1.0.sh
@@ -0,0 +1,48 @@
+#!/bin/bash -ex
+# shellcheck disable=SC2016
+
+#Modified from https://github.com/cachengo/seba_charts/blob/master/scripts/installSEBA.sh
+
+basepath=$(cd "$(dirname "$0")"; pwd)
+CORD_REPO=${CORD_REPO:-https://charts.opencord.org}
+CORD_PLATFORM_VERSION=${CORD_PLATFORM_VERSION:-6.1.0}
+SEBA_VERSION=${SEBA_VERSION:-1.0.0}
+ATT_WORKFLOW_VERSION=${ATT_WORKFLOW_VERSION:-1.0.2}
+CORD_CHART=${CORD_CHART:-${basepath}/../src_repo/seba_charts}
+
+# TODO(alav): Make each step re-entrant
+
+# shellcheck source=/dev/null
+source util.sh
+
+wait_for 10 'test $(kubectl get pods --all-namespaces | grep -ce "tiller.*Running") -eq 1'
+
+# Add the CORD repository and update indexes
+
+if [ "$(uname -m)" == "aarch64" ]; then
+  if [ ! -d "${CORD_CHART}/cord-platform" ]; then
+    #git clone https://github.com/iecedge/seba_charts ${CORD_CHART}
+    cd "$(git rev-parse --show-toplevel)"
+    git submodule update --init "${CORD_CHART}"
+    cd "${basepath}/../src_repo"
+  fi
+else
+  helm repo add cord "${CORD_REPO}"
+  helm repo update
+  CORD_CHART=cord
+fi
+
+
+# Install the CORD platform
+helm install -n cord-platform ${CORD_CHART}/cord-platform --version="${CORD_PLATFORM_VERSION}"
+# Wait until 3 etcd CRDs are present in Kubernetes
+wait_for 300 'test $(kubectl get crd | grep -ice etcd) -eq 3' || true
+
+# Install the SEBA profile
+helm install -n seba --version "${SEBA_VERSION}" ${CORD_CHART}/seba
+wait_for 500 'test $(kubectl get pods | grep -vcE "(\s(.+)/\2.*Running|tosca-loader.*Completed)") -eq 1' || true
+
+# Install the AT&T workflow
+helm install -n att-workflow --version "${ATT_WORKFLOW_VERSION}" ${CORD_CHART}/att-workflow
+wait_for 500 'test $(kubectl get pods | grep -vcE "(\s(.+)/\2.*Running|tosca-loader.*Completed)") -eq 1' || true
+
diff --git a/src/use_cases/seba_on_arm/install/install.sh b/src/use_cases/seba_on_arm/install/install.sh
deleted file mode 100755
index f489c03..0000000
--- a/src/use_cases/seba_on_arm/install/install.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash -ex
-# shellcheck disable=SC2016
-
-#Modified from https://github.com/cachengo/seba_charts/blob/master/scripts/installSEBA.sh
-
-basepath=$(cd "$(dirname "$0")"; pwd)
-CORD_REPO=${CORD_REPO:-https://charts.opencord.org}
-CORD_PLATFORM_VERSION=${CORD_PLATFORM_VERSION:-6.1.0}
-SEBA_VERSION=${SEBA_VERSION:-1.0.0}
-ATT_WORKFLOW_VERSION=${ATT_WORKFLOW_VERSION:-1.0.2}
-CORD_CHART=${CORD_CHART:-${basepath}/../src_repo/seba_charts}
-
-# TODO(alav): Make each step re-entrant
-
-# shellcheck source=/dev/null
-source util.sh
-
-wait_for 10 'test $(kubectl get pods --all-namespaces | grep -ce "tiller.*Running") -eq 1'
-
-# Add the CORD repository and update indexes
-
-if [ "$(uname -m)" == "aarch64" ]; then
-  if [ ! -d "${CORD_CHART}/cord-platform" ]; then
-    #git clone https://github.com/iecedge/seba_charts ${CORD_CHART}
-    cd "$(git rev-parse --show-toplevel)"
-    git submodule update --init "${CORD_CHART}"
-    cd "${basepath}/../src_repo"
-  fi
-else
-  helm repo add cord "${CORD_REPO}"
-  helm repo update
-  CORD_CHART=cord
-fi
-
-
-# Install the CORD platform
-helm install -n cord-platform ${CORD_CHART}/cord-platform --version="${CORD_PLATFORM_VERSION}"
-# Wait until 3 etcd CRDs are present in Kubernetes
-wait_for 300 'test $(kubectl get crd | grep -ice etcd) -eq 3' || true
-
-# Install the SEBA profile
-helm install -n seba --version "${SEBA_VERSION}" ${CORD_CHART}/seba
-wait_for 500 'test $(kubectl get pods | grep -vcE "(\s(.+)/\2.*Running|tosca-loader.*Completed)") -eq 1' || true
-
-# Install the AT&T workflow
-helm install -n att-workflow --version "${ATT_WORKFLOW_VERSION}" ${CORD_CHART}/att-workflow
-wait_for 500 'test $(kubectl get pods | grep -vcE "(\s(.+)/\2.*Running|tosca-loader.*Completed)") -eq 1' || true
-
diff --git a/src/use_cases/seba_on_arm/install/install.sh b/src/use_cases/seba_on_arm/install/install.sh
new file mode 120000
index 0000000..7a9281b
--- /dev/null
+++ b/src/use_cases/seba_on_arm/install/install.sh
@@ -0,0 +1 @@
+../test/ponsim/install.sh
\ No newline at end of file
diff --git a/src/use_cases/seba_on_arm/test/ponsim/install.sh b/src/use_cases/seba_on_arm/test/ponsim/install.sh
index 2b4e13e..2f9438b 100755
--- a/src/use_cases/seba_on_arm/test/ponsim/install.sh
+++ b/src/use_cases/seba_on_arm/test/ponsim/install.sh
@@ -30,6 +30,7 @@ test -d "${CHARTS}" || test -L "${CHARTS}" || \
     ln -s "${basepath}/../../src_repo/helm-charts" "${CHARTS}"
 
 cd "${AUTO_TOOLS}/seba-in-a-box"
+# shellcheck source=/dev/null
 . env.sh
 
 # Now calling make, to install PONSim