Merge "[SEBA-376] Using new profile/workflow helm charts in SiaB"
diff --git a/developer/tag_and_push.sh b/developer/tag_and_push.sh
index db11968..bcc68e3 100755
--- a/developer/tag_and_push.sh
+++ b/developer/tag_and_push.sh
@@ -43,9 +43,9 @@
echo " echo onosproject/onos:1.13.5 | ./tag_and_push.sh" # push the local onosproject/onos:1.13.5 image given in input and pushes it to DockerHub
echo " cat images | ./tag_and_push.sh -t my_tag" # tag with "my_tag" the images in the file images given in input and push them to DockerHub
echo " ./tag_and_push.sh -s images.txt -t my_tag" # tag with "my_tag" the images in the file images.txt and push them to DockerHub
- echo " ./tag_and_push.sh -f xosproject 192.168.10.100:30500" # tag all the xosproject images and push them to the registry 192.168.10.100:30500
+ echo " ./tag_and_push.sh -f xosproject -r 192.168.10.100:30500" # tag all the xosproject images and push them to the registry 192.168.10.100:30500
echo " ./tag_and_push.sh -r 192.168.10.100:30500" # tag all local images and push them to the registry 192.168.10.100:30500
- echo " ./tag_and_push.sh --f xosproject" # push all local images containing xosproject in the name and pushes them to dockerhub
+ echo " ./tag_and_push.sh -f xosproject" # push all local images containing xosproject in the name and pushes them to dockerhub
}
# Parse params
diff --git a/seba-in-a-box/Makefile b/seba-in-a-box/Makefile
index 9ceeb34..1134fc0 100644
--- a/seba-in-a-box/Makefile
+++ b/seba-in-a-box/Makefile
@@ -111,7 +111,7 @@
# Dependency on NEM is there to force ordering for parallel install
# The idea is to install VOLTHA / ONOS / Mininet while NEM is initializing
$(M)/onos: | $(M)/kafka-running $(M)/nem $(INFRA_PREREQS)
- cd $(WORKSPACE)/cord/helm-charts; helm upgrade --install onos onos -f configs/onos.yaml -f $(SEBAVALUES)
+ cd $(WORKSPACE)/cord/helm-charts; helm upgrade --install onos onos -f $(SEBAVALUES)
touch $@
$(M)/voltha: | $(M)/kafka-running $(INFRA_PREREQS) $(M)/etcd-operator-ready