summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhihui wu <wu.zhihui1@zte.com.cn>2018-03-21 02:55:56 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-21 02:55:56 +0000
commitf5f1091a7ea26f26799bb7b41a2222dff038ebda (patch)
tree80965328a44871eb7afcaeac5d6917e437efb050
parentf105ff00efb6c61bac5fecb30b9c629f8b60e2fd (diff)
parent8cf6a5e59aa934ba5eb87b6003beaba1b01d66b7 (diff)
Merge "A initial CI script for network test"
-rw-r--r--tests/ci/network/docker-compose.yaml27
-rwxr-xr-xtests/ci/periodic.sh2
2 files changed, 29 insertions, 0 deletions
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 cc9e806c..ea2c269e 100755
--- a/tests/ci/periodic.sh
+++ b/tests/ci/periodic.sh
@@ -15,6 +15,8 @@ source ${script_dir}/utils/start_services.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