From 70c27f24d07411103fb63090d17390f5ea249ebc Mon Sep 17 00:00:00 2001 From: Jo¶rgen Karlsson Date: Mon, 7 Dec 2015 18:51:22 +0100 Subject: Docker image cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Renamed docker image 'opnfv/yardstick-ci' -> 'opnfv/yardstick' as recommended by project. - Added cirros image and releng repo to docker image in order to make it more usable in offline mode. - Renamed run_benchmarks to run_tests.sh - Moved some environment setups to a new file prepare_env.sh - Added daily test suites file for ericsson and LF pods. Docker image is now built and pushed by releng script: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=blob;f=jjb/opnfv/opnfv-docker.sh The ci/docker/Makefile file is not used by releng to build yardstick image but the makefile can still be used to build and test docker images locally. Change-Id: If9d6740b39e91d145c587d8d5e2bd372d09a46a9 Signed-off-by: Jo¶rgen Karlsson --- tests/opnfv/test_suites/opnfv_ericsson_daily.yaml | 10 ++++++++++ tests/opnfv/test_suites/opnfv_lf_daily.yaml | 10 ++++++++++ tests/opnfv/test_suites/pod2_daily.yaml | 10 ---------- 3 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 tests/opnfv/test_suites/opnfv_ericsson_daily.yaml create mode 100644 tests/opnfv/test_suites/opnfv_lf_daily.yaml delete mode 100644 tests/opnfv/test_suites/pod2_daily.yaml (limited to 'tests/opnfv') diff --git a/tests/opnfv/test_suites/opnfv_ericsson_daily.yaml b/tests/opnfv/test_suites/opnfv_ericsson_daily.yaml new file mode 100644 index 000000000..80689beb1 --- /dev/null +++ b/tests/opnfv/test_suites/opnfv_ericsson_daily.yaml @@ -0,0 +1,10 @@ +--- +# LF POD 2 daily task suite + +schema: "yardstick:suite:0.1" + +name: "opnfv_ericsson_daily" +test_cases_dir: "tests/opnfv/test_cases/" +test_cases: +- + file_name: opnfv_yardstick_tc002.yaml diff --git a/tests/opnfv/test_suites/opnfv_lf_daily.yaml b/tests/opnfv/test_suites/opnfv_lf_daily.yaml new file mode 100644 index 000000000..022aeeceb --- /dev/null +++ b/tests/opnfv/test_suites/opnfv_lf_daily.yaml @@ -0,0 +1,10 @@ +--- +# LF POD 2 daily task suite + +schema: "yardstick:suite:0.1" + +name: "opnfv_lf_daily" +test_cases_dir: "tests/opnfv/test_cases/" +test_cases: +- + file_name: opnfv_yardstick_tc002.yaml diff --git a/tests/opnfv/test_suites/pod2_daily.yaml b/tests/opnfv/test_suites/pod2_daily.yaml deleted file mode 100644 index 15252bee8..000000000 --- a/tests/opnfv/test_suites/pod2_daily.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# LF POD 2 daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_pod2_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- cgit 1.2.3-korg