From bf43e353b3a57356c6ae0186e6af148897fa73a4 Mon Sep 17 00:00:00 2001 From: kinkwan_tsui Date: Wed, 29 May 2019 23:59:03 +0300 Subject: [PATCH] delete the eol Change-Id: Ic23709d75d405ac77b962bcf3ea9ab49f4882efe Signed-off-by: kinkwan_tsui --- workflows/nanobot.sh | 130 +++++++++++----------- workflows/ric_automation.sh | 264 ++++++++++++++++++++++---------------------- workflows/robot_test_ric.sh | 124 ++++++++++----------- 3 files changed, 259 insertions(+), 259 deletions(-) diff --git a/workflows/nanobot.sh b/workflows/nanobot.sh index 05f40b8..dc02070 100755 --- a/workflows/nanobot.sh +++ b/workflows/nanobot.sh @@ -1,65 +1,65 @@ -#!/bin/bash -#------------------nanobot Pre-modification------------------------------------------------------------ -cd RIC/test/ric_robot_suite -#------------------Build the robot suite--------------------------------------------------------------- -docker build -t nanobot:latest -f docker/Dockerfile.nanobot . - -#---------pre-create the log file directory- find the value from the values.yaml----------------------- -sudo chown -R cloudadmin /opt -mkdir -p /opt/ric/robot/log - -kubectl create namespace rictest -kubectl create namespace ricxapp - -#----------create ricplatform danmnet------------------------------------------------------------------- -cat < /dev/null)" -if [[ $command != "" ]]; then - exit 1 -fi +#!/bin/bash +#------------------nanobot Pre-modification------------------------------------------------------------ +cd RIC/test/ric_robot_suite +#------------------Build the robot suite--------------------------------------------------------------- +docker build -t nanobot:latest -f docker/Dockerfile.nanobot . + +#---------pre-create the log file directory- find the value from the values.yaml----------------------- +sudo chown -R cloudadmin /opt +mkdir -p /opt/ric/robot/log + +kubectl create namespace rictest +kubectl create namespace ricxapp + +#----------create ricplatform danmnet------------------------------------------------------------------- +cat < /dev/null)" +if [[ $command != "" ]]; then + exit 1 +fi diff --git a/workflows/ric_automation.sh b/workflows/ric_automation.sh index 57e53cc..fbb39f9 100755 --- a/workflows/ric_automation.sh +++ b/workflows/ric_automation.sh @@ -1,132 +1,132 @@ - -#------------------------Pre-Modification---------------------------------------------------- -mkdir RIC -cd RIC - -#---------Clone the repo and perform the steps customize the deployment and values files------ -git clone https://gerrit.o-ran-sc.org/r/it/dep -#run the localize script -cd /home/cloudadmin/RIC/dep -git checkout 189c974169043e89fa216df5ca638fb550e041e4 -cat <runric_env.sh - -#!/bin/bash -################################################################################ -# Copyright (c) 2019 AT&T Intellectual Property. # -# Copyright (c) 2019 Nokia. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); # -# you may not use this file except in compliance with the License. # -# You may obtain a copy of the License at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" BASIS, # -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -################################################################################ - - -# customize the following repo info to local infrastructure -export __RICENV_SET__='1' -export __RUNRICENV_GERRIT_HOST__='gerrit-o-ran-sc.org' -export __RUNRICENV_GERRIT_IP__='34.215.66.175'_ - -export __RUNRICENV_DOCKER_HOST__='rancodev' -export __RUNRICENV_DOCKER_IP__='127.0.0.1' -export __RUNRICENV_DOCKER_PORT__='5555' -export __RUNRICENV_DOCKER_USER__='docker' -export __RUNRICENV_DOCKER_PASS__='docker' - -export __RUNRICENV_HELMREPO_HOST__='chart-repo.kube-system.svc.rec.io' -export __RUNRICENV_HELMREPO_PORT__='8088/charts' -export __RUNRICENV_HELMREPO_IP__='127.0.0.1' -export __RUNRICENV_HELMREPO_USER__='helm' -export __RUNRICENV_HELMREPO_PASS__='helm' -EOF - -source runric_env.sh -./localize.sh - -cd generated/ricplt -deployment_files="$(find . -name deployment.yaml)" -for file in $deployment_files; do - sed -i '/restartPolicy/d' "$file" -done - -#------------------Delete the nodeport and privileges lines---------------------------------------- -sed -ri 's/^(\s*)(type\s*:\s*NodePort\s*$)/\1type: ClusterIP/' appmgr/charts/appmgr/values.yaml -sed -ri 's/^(\s*)(type\s*:\s*NodePort\s*$)/\1type: ClusterIP/' e2mgr/charts/e2mgr/values.yaml -deployment_files="$(find . -name deployment.yaml)" -for file in $deployment_files; do - sed -i '/privileged: true/d' "$file" -done - -#------------------Edit the appmgr file including the path of the ca certificate------------------- -cp /etc/openssl/ca.pem preric/resources/helmrepo.crt -sed -i '/hostAliases:/,/system.svc.rec.io"/d' appmgr/charts/appmgr/templates/deployment.yaml - -#-----------------Update tiller container name----------------------------------------------------- -sed -ri 's/^(\s*)("tiller-service"\s*:\s*"tiller-deploy"\s*$)/\1"tiller-service": "tiller"/' appmgr/charts/appmgr/values.yaml - -#-----------------Change the repo location to rec.io---------------------------------------------- -values_files="$(find . -name values.yaml)" -for file in $values_files; do - sed -i 's,rancodev:5555,registry.kube-system.svc.rec.io:5555/ric,g' "$file" -done - -#-----------------Change the repo location to rec.io--------------------------------------------- -requirements_files="$(find . -name requirements.yaml)" -for file in $requirements_files; do - sed -i 's,local,localric,g' "$file" -done - -sed -i 's,rancodev:5555,rancodev,g' ./prepull.sh -sed -i 's/docker logout/#/' ./prepull.sh -sed -i 's/docker login/#/' ./prepull.sh - -#!/bin/bash -#-----------------Installation-------------------------------------------------------------------- -#--------------Reloading docker images----------------------------------------------------------- -echo "docker" | sh ./prepull.sh - -#retag scripts -for i in \ -"xapp-manager:latest" \ -"e2mgr:1.0.0" \ -"e2:1.0.0" \ -"rtmgr:0.0.2" \ -"redis-standalone:latest" -do -echo $i -docker tag rancodev/${i} registry.kube-system.svc.rec.io:5555/ric/${i} -docker push registry.kube-system.svc.rec.io:5555/ric/${i} -done - -#-------------create ricplatform namespace------------------------------------------------------ -kubectl create namespace ricplatform - -#create ricplatform danmnet -cat < /dev/null)" -if [[ $command != "" ]]; then - exit 1 -fi +#!/bin/bash +#------------------------Pre-Modification---------------------------------------------------- +mkdir RIC +cd RIC + +#---------Clone the repo and perform the steps customize the deployment and values files------ +git clone https://gerrit.o-ran-sc.org/r/it/dep +#run the localize script +cd /home/cloudadmin/RIC/dep +git checkout 189c974169043e89fa216df5ca638fb550e041e4 +cat <runric_env.sh + +#!/bin/bash +################################################################################ +# Copyright (c) 2019 AT&T Intellectual Property. # +# Copyright (c) 2019 Nokia. # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); # +# you may not use this file except in compliance with the License. # +# You may obtain a copy of the License at # +# # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, # +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +################################################################################ + + +# customize the following repo info to local infrastructure +export __RICENV_SET__='1' +export __RUNRICENV_GERRIT_HOST__='gerrit-o-ran-sc.org' +export __RUNRICENV_GERRIT_IP__='34.215.66.175'_ + +export __RUNRICENV_DOCKER_HOST__='rancodev' +export __RUNRICENV_DOCKER_IP__='127.0.0.1' +export __RUNRICENV_DOCKER_PORT__='5555' +export __RUNRICENV_DOCKER_USER__='docker' +export __RUNRICENV_DOCKER_PASS__='docker' + +export __RUNRICENV_HELMREPO_HOST__='chart-repo.kube-system.svc.rec.io' +export __RUNRICENV_HELMREPO_PORT__='8088/charts' +export __RUNRICENV_HELMREPO_IP__='127.0.0.1' +export __RUNRICENV_HELMREPO_USER__='helm' +export __RUNRICENV_HELMREPO_PASS__='helm' +EOF + +source runric_env.sh +./localize.sh + +cd generated/ricplt +deployment_files="$(find . -name deployment.yaml)" +for file in $deployment_files; do + sed -i '/restartPolicy/d' "$file" +done + +#------------------Delete the nodeport and privileges lines---------------------------------------- +sed -ri 's/^(\s*)(type\s*:\s*NodePort\s*$)/\1type: ClusterIP/' appmgr/charts/appmgr/values.yaml +sed -ri 's/^(\s*)(type\s*:\s*NodePort\s*$)/\1type: ClusterIP/' e2mgr/charts/e2mgr/values.yaml +deployment_files="$(find . -name deployment.yaml)" +for file in $deployment_files; do + sed -i '/privileged: true/d' "$file" +done + +#------------------Edit the appmgr file including the path of the ca certificate------------------- +cp /etc/openssl/ca.pem preric/resources/helmrepo.crt +sed -i '/hostAliases:/,/system.svc.rec.io"/d' appmgr/charts/appmgr/templates/deployment.yaml + +#-----------------Update tiller container name----------------------------------------------------- +sed -ri 's/^(\s*)("tiller-service"\s*:\s*"tiller-deploy"\s*$)/\1"tiller-service": "tiller"/' appmgr/charts/appmgr/values.yaml + +#-----------------Change the repo location to rec.io---------------------------------------------- +values_files="$(find . -name values.yaml)" +for file in $values_files; do + sed -i 's,rancodev:5555,registry.kube-system.svc.rec.io:5555/ric,g' "$file" +done + +#-----------------Change the repo location to rec.io--------------------------------------------- +requirements_files="$(find . -name requirements.yaml)" +for file in $requirements_files; do + sed -i 's,local,localric,g' "$file" +done + +sed -i 's,rancodev:5555,rancodev,g' ./prepull.sh +sed -i 's/docker logout/#/' ./prepull.sh +sed -i 's/docker login/#/' ./prepull.sh + +#!/bin/bash +#-----------------Installation-------------------------------------------------------------------- +#--------------Reloading docker images----------------------------------------------------------- +echo "docker" | sh ./prepull.sh + +#retag scripts +for i in \ +"xapp-manager:latest" \ +"e2mgr:1.0.0" \ +"e2:1.0.0" \ +"rtmgr:0.0.2" \ +"redis-standalone:latest" +do +echo $i +docker tag rancodev/${i} registry.kube-system.svc.rec.io:5555/ric/${i} +docker push registry.kube-system.svc.rec.io:5555/ric/${i} +done + +#-------------create ricplatform namespace------------------------------------------------------ +kubectl create namespace ricplatform + +#create ricplatform danmnet +cat < /dev/null)" +if [[ $command != "" ]]; then + exit 1 +fi diff --git a/workflows/robot_test_ric.sh b/workflows/robot_test_ric.sh index d793542..d16e8a3 100755 --- a/workflows/robot_test_ric.sh +++ b/workflows/robot_test_ric.sh @@ -1,62 +1,62 @@ -#!/bin/bash -#-----------Pre-modification------------------------------ -cd RIC -git clone https://gerrit.o-ran-sc.org/r/it/test -cp test/ric_robot_suite/helm/robot_install.sh /home/cloudadmin/RIC/dep/generated/ricplt - -#-----------Changing the repo location to rec.io----------- -sed -i 's,snapshot.docker.ranco-dev-tools.eastus.cloudapp.azure.com:10001,registry.kube-system.svc.rec.io:5555,g' test/ric_robot_suite/helm/ric-robot/values.yaml -sed -ri '/nodePort: 30209/d' test/ric_robot_suite/helm/ric-robot/values.yaml -sed -ri 's/^(\s*)(type\s*:\s*NodePort\s*$)/\1type: ClusterIP/' test/ric_robot_suite/helm/ric-robot/values.yaml -sed -i 's/ tag: latest/ tag: 0.1.0-SNAPSHOT-20190318152929/' test/ric_robot_suite/helm/ric-robot/values.yaml -cd dep/generated/ricplt - -#-----------Doing the Docker pull-------------------------- -#echo "docker" | docker login -u docker --password-stdin snapshot.docker.ranco-dev-tools.eastus.cloudapp.azure.com:10001 -#docker pull snapshot.docker.ranco-dev-tools.eastus.cloudapp.azure.com:10001/test/ric-robot:latest -docker pull rancodev/ric-robot:0.1.0-SNAPSHOT-20190318152929 -#docker logout snapshot.docker.ranco-dev-tools.eastus.cloudapp.azure.com:10001 - - -#-----------Retagging--------------------------------------- -docker tag rancodev/ric-robot:0.1.0-SNAPSHOT-20190318152929 registry.kube-system.svc.rec.io:5555/test/ric-robot:0.1.0-SNAPSHOT-20190318152929 -docker push registry.kube-system.svc.rec.io:5555/test/ric-robot:0.1.0-SNAPSHOT-20190318152929 - - -#----------- robot_install---------------------------------- -# Note: -# This file needs to be in the it/dep/generated/ricplt directory with ric_install.sh/ric_uninstall.sh -# so that it can use the same dist/packages as the ricplt install -# -# ricplt is in: it/dep/geneated/ricplt -# ric-robot is in: it/test/ric_robot_suite -# -if [ ! -e ric-robot ]; then - ln -s ../../../test/ric_robot_suite/helm/ric-robot ric-robot -fi - - -helm repo add localric http://127.0.0.1:8879/charts -helm package -d dist/packages ric-robot -pkill helm -helm serve --repo-path dist/packages & -sleep 2 -helm repo update - -# if you need to override the repo change the image.repository line for deployment -# helm install local/ric-robot --namespace ricplatform --name ric-robot --set image.repository=snapshot.docker.ranco-dev-tools.eastus.cloudapp.azure.com:10001/test/ric-robot -# -helm install localric/ric-robot --namespace ricplatform --name ric-robot -helm repo update -#cd ../../../ -ric_robot_pod=$(kubectl get pods -l app.kubernetes.io/instance=ric-robot -n ricplatform -o go-template --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}') -kubectl exec -n ricplatform -it $ric_robot_pod -- sed -i '17,19 s/^/#/' /var/opt/RIC/robot/testsuites/health-check.robot - -#---------show the test cases------------------------------ -cd /home/cloudadmin/RIC/test/ric_robot_suite/helm/ric-robot/ -bash ete-k8s.sh ricplatform health -#----------checking the status of the pods------------------ -command="$(kubectl get po --no-headers --namespace=ricplatform --field-selector status.phase!=Running 2> /dev/null)" -if [[ $command != "" ]]; then - exit 1 -fi +#!/bin/bash +#-----------Pre-modification------------------------------ +cd RIC +git clone https://gerrit.o-ran-sc.org/r/it/test +cp test/ric_robot_suite/helm/robot_install.sh /home/cloudadmin/RIC/dep/generated/ricplt + +#-----------Changing the repo location to rec.io----------- +sed -i 's,snapshot.docker.ranco-dev-tools.eastus.cloudapp.azure.com:10001,registry.kube-system.svc.rec.io:5555,g' test/ric_robot_suite/helm/ric-robot/values.yaml +sed -ri '/nodePort: 30209/d' test/ric_robot_suite/helm/ric-robot/values.yaml +sed -ri 's/^(\s*)(type\s*:\s*NodePort\s*$)/\1type: ClusterIP/' test/ric_robot_suite/helm/ric-robot/values.yaml +sed -i 's/ tag: latest/ tag: 0.1.0-SNAPSHOT-20190318152929/' test/ric_robot_suite/helm/ric-robot/values.yaml +cd dep/generated/ricplt + +#-----------Doing the Docker pull-------------------------- +#echo "docker" | docker login -u docker --password-stdin snapshot.docker.ranco-dev-tools.eastus.cloudapp.azure.com:10001 +#docker pull snapshot.docker.ranco-dev-tools.eastus.cloudapp.azure.com:10001/test/ric-robot:latest +docker pull rancodev/ric-robot:0.1.0-SNAPSHOT-20190318152929 +#docker logout snapshot.docker.ranco-dev-tools.eastus.cloudapp.azure.com:10001 + + +#-----------Retagging--------------------------------------- +docker tag rancodev/ric-robot:0.1.0-SNAPSHOT-20190318152929 registry.kube-system.svc.rec.io:5555/test/ric-robot:0.1.0-SNAPSHOT-20190318152929 +docker push registry.kube-system.svc.rec.io:5555/test/ric-robot:0.1.0-SNAPSHOT-20190318152929 + + +#----------- robot_install---------------------------------- +# Note: +# This file needs to be in the it/dep/generated/ricplt directory with ric_install.sh/ric_uninstall.sh +# so that it can use the same dist/packages as the ricplt install +# +# ricplt is in: it/dep/geneated/ricplt +# ric-robot is in: it/test/ric_robot_suite +# +if [ ! -e ric-robot ]; then + ln -s ../../../test/ric_robot_suite/helm/ric-robot ric-robot +fi + + +helm repo add localric http://127.0.0.1:8879/charts +helm package -d dist/packages ric-robot +pkill helm +helm serve --repo-path dist/packages & +sleep 2 +helm repo update + +# if you need to override the repo change the image.repository line for deployment +# helm install local/ric-robot --namespace ricplatform --name ric-robot --set image.repository=snapshot.docker.ranco-dev-tools.eastus.cloudapp.azure.com:10001/test/ric-robot +# +helm install localric/ric-robot --namespace ricplatform --name ric-robot +helm repo update +#cd ../../../ +ric_robot_pod=$(kubectl get pods -l app.kubernetes.io/instance=ric-robot -n ricplatform -o go-template --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}') +kubectl exec -n ricplatform -it $ric_robot_pod -- sed -i '17,19 s/^/#/' /var/opt/RIC/robot/testsuites/health-check.robot + +#---------show the test cases------------------------------ +cd /home/cloudadmin/RIC/test/ric_robot_suite/helm/ric-robot/ +bash ete-k8s.sh ricplatform health +#----------checking the status of the pods------------------ +command="$(kubectl get po --no-headers --namespace=ricplatform --field-selector status.phase!=Running 2> /dev/null)" +if [[ $command != "" ]]; then + exit 1 +fi -- 2.16.6