5 files changed, 47 insertions, 9 deletions
diff --git a/tests/ci/compute/docker-compose.yaml b/tests/ci/compute/docker-compose.yaml
index 712c9c54..896908d1 100644
--- a/tests/ci/compute/docker-compose.yaml
+++ b/tests/ci/compute/docker-compose.yaml
@@ -11,8 +11,9 @@ version: '2'
 services:
 
   qtip:
-    container_name: compute_qtip
+    container_name: compute_qtip_${SUT}
     image: opnfv/qtip:${DOCKER_TAG}
     env_file: ${ENV_FILE}
     volumes:
       - ${SSH_CREDENTIALS}:/root/.ssh
+      - ${IMAGE_DIR}:/tmp
diff --git a/tests/ci/experimental.sh b/tests/ci/experimental.sh
index 7fa18f2f..e45611e5 100755
--- a/tests/ci/experimental.sh
+++ b/tests/ci/experimental.sh
@@ -17,21 +17,22 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export DEPLOY_SCENARIO='generic'
 export DOCKER_TAG='latest'
 export CI_DEBUG='false'
-export TEST_SUITE='storage'
+export TEST_SUITE='compute'
 export TESTAPI_URL=''
 export SSH_CREDENTIALS='/root/.ssh'
-
 export WORKSPACE=${WORKSPACE:-$(pwd)}
+export SUT='vnf'
 
 source ${script_dir}/utils/start_services.sh
 
 cd ${WORKSPACE}
 
 qtip_repo='/home/opnfv/repos/qtip'
-docker cp . ${TEST_SUITE}_qtip:${qtip_repo}
-docker exec ${TEST_SUITE}_qtip bash -c "cd ${qtip_repo} && pip install -U -e ."
+docker cp . ${TEST_SUITE}_qtip_${SUT}:${qtip_repo}
+docker exec ${TEST_SUITE}_qtip_${SUT} bash -c "cd ${qtip_repo} && pip install -U -e ."
+
+docker exec ${TEST_SUITE}_qtip_${SUT} bash -x ${qtip_repo}/qtip/scripts/quickstart.sh -u "${SUT}"
 
-docker exec ${TEST_SUITE}_qtip bash -x ${qtip_repo}/qtip/scripts/quickstart.sh
 echo "QTIP: Verify ${TEST_SUITE} done!"
 
 exit 0
diff --git a/tests/ci/network/docker-compose.yaml b/tests/ci/network/docker-compose.yaml
new file mode 100644
index 00000000..d4f2c904
--- /dev/null
+++ b/tests/ci/network/docker-compose.yaml
@@ -0,0 +1,27 @@
+##############################################################################
+# Copyright (c) 2017 Dell EMC, ZTE and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+version: '2'
+services:
+
+  nettest:
+    container_name: nettest_qtip
+    image: opnfv/qtip-nettest:${DOCKER_TAG}
+    ports:
+      - 5001:5000
+    env_file: ${ENV_FILE}
+
+  qtip:
+    container_name: network_qtip
+    image: opnfv/qtip:${DOCKER_TAG}
+    env_file: ${ENV_FILE}
+    volumes:
+      - ${SSH_CREDENTIALS}:/root/.ssh
+    links:
+      - nettest
diff --git a/tests/ci/periodic.sh b/tests/ci/periodic.sh
index 87fa7627..ea2c269e 100755
--- a/tests/ci/periodic.sh
+++ b/tests/ci/periodic.sh
@@ -13,7 +13,13 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source ${script_dir}/utils/start_services.sh
 
-docker exec ${TEST_SUITE}_qtip bash -x /home/opnfv/repos/qtip/qtip/scripts/quickstart.sh
+if [[ "${TEST_SUITE}" =~ "compute" ]];then
+    docker exec ${TEST_SUITE}_qtip_${SUT} bash -x /home/opnfv/repos/qtip/qtip/scripts/quickstart.sh -u "${SUT}"
+elif [[ "${TEST_SUITE}" =~ "network" ]];then
+    :
+else
+    docker exec ${TEST_SUITE}_qtip bash -x /home/opnfv/repos/qtip/qtip/scripts/quickstart.sh
+fi
 
 echo "${TEST_SUITE} QPI done!"
 
diff --git a/tests/ci/utils/start_services.sh b/tests/ci/utils/start_services.sh
index c2129570..6280be36 100644
--- a/tests/ci/utils/start_services.sh
+++ b/tests/ci/utils/start_services.sh
@@ -19,6 +19,7 @@ OPNFV_RELEASE=${OPNFV_RELEASE:-}
 EOF
 
 export SSH_CREDENTIALS=${SSH_CREDENTIALS:-/root/.ssh}
+export IMAGE_DIR=${IMAGE_DIR:-$HOME/tmp}
 
 TMPFILE=`mktemp /tmp/qtip.XXXXXX` || exit 1
 curl https://git.opnfv.org/releng/plain/utils/fetch_os_creds.sh | bash -s -- \
@@ -28,8 +29,10 @@ grep "export" ${TMPFILE} | sed "s/export //" >> $ENV_FILE
 sed -i '/^PYTHONWARNINGS=/d' $ENV_FILE
 
 # In CI job, it still uses fuel to represent MCP.
-if [[ "${BRANCH}" =~ "master" && "${INSTALLER_TYPE}" =~ "fuel" ]];then
-   sed -i 's/^INSTALLER_TYPE=fuel/INSTALLER_TYPE=mcp/g' $ENV_FILE
+if [[ "${INSTALLER_TYPE}" =~ "fuel" ]];then
+    if [[ ! "${BRANCH}" =~ "euphrates" ]];then
+        sed -i 's/^INSTALLER_TYPE=fuel/INSTALLER_TYPE=mcp/g' $ENV_FILE
+    fi
 fi
 
 docker-compose -f $script_dir/${TEST_SUITE}/docker-compose.yaml pull