X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=plans%2Fccsdk-oran%2Fpolmansuite%2Fsetup.sh;h=10fed96f59de8c8b59da47789c4cf08f7f6b23eb;hb=7330ced367b4a312fbde2ca602dc54ce51931d14;hp=c0dfa150c39b63ab2518ee7113c50cc8d42f9742;hpb=803e49918dc80f21859b2355dcc33e179abb5fa1;p=integration%2Fcsit.git

diff --git a/plans/ccsdk-oran/polmansuite/setup.sh b/plans/ccsdk-oran/polmansuite/setup.sh
index c0dfa150..10fed96f 100755
--- a/plans/ccsdk-oran/polmansuite/setup.sh
+++ b/plans/ccsdk-oran/polmansuite/setup.sh
@@ -22,13 +22,12 @@ cd $WORKSPACE/archives
 git clone "https://gerrit.o-ran-sc.org/r/nonrtric"
 
 AUTOTEST_ROOT=$WORKSPACE/archives/nonrtric/test/auto-test
+POLMAN_PLANS=$WORKSPACE/plans/ccsdk-oran/polmansuite
 
-# Temporary solution to setup the Non-RT RIC components to point to ONAP images and tags
-# Shall be removed when the Non-RT RIC test env is moved/copied to ONAP
-cp $WORKSPACE/plans/ccsdk-oran/polmansuite/test_env.sh $WORKSPACE/archives/nonrtric/test/common
-
-# Temporary solution to not test with the SDNC image
-cp $WORKSPACE/plans/ccsdk-oran/polmansuite/FTC1.sh $WORKSPACE/archives/nonrtric/test/auto-test/FTC1.sh
+#Copy test script, adapted to ONAP images
+cp $POLMAN_PLANS/FTC1.sh $WORKSPACE/archives/nonrtric/test/auto-test/FTC1.sh
+cp $POLMAN_PLANS/FTC150.sh $WORKSPACE/archives/nonrtric/test/auto-test/FTC150.sh
 
 #Make the env vars availble to the robot scripts
-ROBOT_VARIABLES="-b debug.log -v AUTOTEST_ROOT:${AUTOTEST_ROOT}"
+ROBOT_VARIABLES="-b debug.log -v AUTOTEST_ROOT:${AUTOTEST_ROOT} -v POLMAN_PLANS:${POLMAN_PLANS}"
+