summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrudence Au <prudence.au@amdocs.com>2018-11-07 02:00:22 +0000
committerGerrit Code Review <gerrit@onap.org>2018-11-07 02:00:22 +0000
commit01fcae8c183ecc251b38fa591dfde8cb7a894a37 (patch)
tree79a13d7606be2d9abd22c9601f99e746d5003010
parent725fc53a254abd0af88771e52effbd20a9e6f5b9 (diff)
parent856169460ce5b5c2870e3cbb60e5cdc9cfa46c27 (diff)
Merge "cd.sh adjust for helm deploy plugin"
-rwxr-xr-xdeploy/cd.sh12
1 files changed, 7 insertions, 5 deletions
diff --git a/deploy/cd.sh b/deploy/cd.sh
index 82f9a40..295ef01 100755
--- a/deploy/cd.sh
+++ b/deploy/cd.sh
@@ -71,12 +71,11 @@ deploy_onap() {
# wait for 0/1 before deleting
echo "sleeping 30 sec"
# delete potential hanging clustered pods
- kubectl delete pod $ENVIRON-aaf-sms-vault-0 -n $ENVIRON --grace-period=0 --force
- kubectl delete pod $ENVIRON-aai-cassandra-0 -n $ENVIRON --grace-period=0 --force
- kubectl delete pod $ENVIRON-aai-cassandra-1 -n $ENVIRON --grace-period=0 --force
- kubectl delete pod $ENVIRON-aai-cassandra-2 -n $ENVIRON --grace-period=0 --force
+ #kubectl delete pod $ENVIRON-aaf-sms-vault-0 -n $ENVIRON --grace-period=0 --force
# specific to when there is no helm release
kubectl delete pv --all
+ kubectl delete pvc --all
+ kubectl delete secrets --all
kubectl delete clusterrolebinding --all
# replace with watch
# keep jenkins 120 sec timeout happy with echos
@@ -97,6 +96,8 @@ deploy_onap() {
rm -rf oom
echo "pull new oom"
git clone -b $BRANCH http://gerrit.onap.org/r/oom
+ # https://wiki.onap.org/display/DW/OOM+Helm+%28un%29Deploy+plugins
+ sudo cp -R ~/oom/kubernetes/helm/plugins/ ~/.helm
fi
if [ "$BRANCH" == "amsterdam" ]; then
@@ -134,7 +135,8 @@ deploy_onap() {
sudo make clean
sudo make all
sudo make $ENVIRON
- sudo helm install local/onap -n onap --namespace $ENVIRON
+ #sudo helm install local/onap -n onap --namespace $ENVIRON
+ sudo helm deploy onap local/onap --namespace $ENVIRON
cd ../../
fi