X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=test%2Fauto-test%2FstartMR.sh;h=47b45149bdc296c4e57455e587b44b3772a80557;hb=663566c28930429775ea9921f0e32ddf5253da28;hp=ec1e062cc7784592f7b1872ceb2082e50812e140;hpb=d289079b1b15286e994bc29b98cd732fc32fb06f;p=nonrtric.git diff --git a/test/auto-test/startMR.sh b/test/auto-test/startMR.sh index ec1e062c..47b45149 100755 --- a/test/auto-test/startMR.sh +++ b/test/auto-test/startMR.sh @@ -21,20 +21,20 @@ TC_ONELINE_DESCR="Starts DMAAP MR" #App names to include in the test when running docker, space separated list -DOCKER_INCLUDED_IMAGES="MR DMAAPMR" +DOCKER_INCLUDED_IMAGES="MR DMAAPMR KUBEPROXY" #App names to include in the test when running kubernetes, space separated list -KUBE_INCLUDED_IMAGES="CP CR MR PA RICSIM SDNC KUBEPROXY NGW" +KUBE_INCLUDED_IMAGES="MR DMAAPMR KUBEPROXY" #Prestarted app (not started by script) to include in the test when running kubernetes, space separated list KUBE_PRESTARTED_IMAGES="" #Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if #the image is not configured in the supplied env_file #Used for images not applicable to all supported profile -CONDITIONALLY_IGNORED_IMAGES="NGW" +CONDITIONALLY_IGNORED_IMAGES="" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE" +SUPPORTED_PROFILES="ONAP-HONOLULU ONAP-ISTANBUL ORAN-D-RELEASE ORAN-E-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" @@ -55,10 +55,13 @@ setup_testenvironment #### TEST BEGIN #### clean_environment +start_kube_proxy start_mr -docker kill mr-stub +if [ $RUNMODE == "KUBE" ]; then + : +else + docker kill $MR_STUB_APP_NAME +fi -print_result -