Commit ff881aa8 authored by Yann Garcia's avatar Yann Garcia
Browse files

Merging InterDigital AdvantEDGE 'develop' branch into ETSI 'STF625_TASK4'...

Merging InterDigital AdvantEDGE 'develop' branch into ETSI 'STF625_TASK4' branch - Third round: fixing bugs
parent 1a57c1d0
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -890,7 +890,7 @@ repo:
      # enable meepctl dockerize -> deps are never dockerized
      dockerize: false
      # enable meepctl deploy/delete
      deploy: false
      deploy: true
      # location of deployment chart
      chart: charts/cert-manager
      # user supplied value file located @ .meep/user/values (use below file name)
+2 −0
Original line number Diff line number Diff line
@@ -11,12 +11,14 @@ mv /meep-loc-serv /templates/sandbox/meep-loc-serv
mv /meep-metrics-engine /templates/sandbox/meep-metrics-engine
mv /meep-mg-manager /templates/sandbox/meep-mg-manager
mv /meep-rnis /templates/sandbox/meep-rnis
mv /meep-dai /templates/sandbox/meep-dai
mv /meep-app-enablement /templates/sandbox/meep-app-enablement
mv /meep-wais /templates/sandbox/meep-wais
mv /meep-ams /templates/sandbox/meep-ams
mv /meep-sandbox-ctrl /templates/sandbox/meep-sandbox-ctrl
mv /meep-tc-engine /templates/sandbox/meep-tc-engine
mv /meep-vis /templates/sandbox/meep-vis
mv /meep-tm /templates/sandbox/meep-tm

mkdir -p /templates/scenario
mv /meep-virt-chart-templates /templates/scenario/meep-virt-chart-templates
+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ stop_advantedge() {
	meepctl delete dep
	sleep $TIMEOUT
	kubectl get pods --all-namespaces
	sleep $TIMEOUT
	helm delete --no-hooks meep-prometheus
    fi
    IS_RUNNING=`kubectl get pods --all-namespaces | grep "meep-virt-engine" | awk '{print $2}'`
}