aboutsummaryrefslogtreecommitdiffstats
path: root/tests/ci/storperf
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2017-09-08 17:08:59 +0800
committerYujun Zhang <zhang.yujunz@zte.com.cn>2017-09-13 15:48:48 +0800
commit2bf95e68a19fc3a7c1e3236a977b1d3b6db1c05c (patch)
treec533c1182ffa2314c95c82edf44b9475f8e7f294 /tests/ci/storperf
parent4154a75853f6ba004de775194ebffbe00b591012 (diff)
Refactor CI scripts
- Move scripts executed inside container to qtip/scripts - tests/ci is limited to setup the environment and start services Change-Id: I454c715890601c6c6472006c2f0f6131695c2f51 Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
Diffstat (limited to 'tests/ci/storperf')
-rwxr-xr-xtests/ci/storperf/containers.sh22
-rw-r--r--tests/ci/storperf/qtip-storperf-docker-compose.yaml25
2 files changed, 0 insertions, 47 deletions
diff --git a/tests/ci/storperf/containers.sh b/tests/ci/storperf/containers.sh
deleted file mode 100755
index 62f8d4d5..00000000
--- a/tests/ci/storperf/containers.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/bash
-##############################################################################
-# Copyright (c) 2017 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
-##############################################################################
-
-clean_containers()
-{
- echo "QTIP: Cleanup existing qtip and storperf containers"
- docker-compose -f qtip-storperf-docker-compose.yaml down
-}
-
-
-launch_containers()
-{
- echo "Launch new qtip and storperf containers"
- docker-compose -f qtip-storperf-docker-compose.yaml pull
- docker-compose -f qtip-storperf-docker-compose.yaml up -d
-} \ No newline at end of file
diff --git a/tests/ci/storperf/qtip-storperf-docker-compose.yaml b/tests/ci/storperf/qtip-storperf-docker-compose.yaml
deleted file mode 100644
index a1360200..00000000
--- a/tests/ci/storperf/qtip-storperf-docker-compose.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-##############################################################################
-# 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:
-
- storperf:
- container_name: storperf
- image: opnfv/storperf:${DOCKER_TAG}
- ports:
- - 5000:5000
- env_file: ${ENV_FILE}
-
- qtip:
- container_name: qtip
- image: opnfv/qtip:${DOCKER_TAG}
- env_file: ${ENV_FILE}
- links:
- - storperf