From: MatthewLi <matthew.lijun@huawei.com>
Date: Tue, 24 May 2016 01:32:49 +0000 (-0400)
Subject: move /ci into /tests directory
X-Git-Tag: colorado.1.0~161
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F33%2F14533%2F1;p=yardstick.git

move /ci into /tests directory

JIRA: YARDSTICK-269

Change-Id: I2b552aded888fa9d8f8ddd8d902b3d7f6d31a607
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
---

diff --git a/run_tests.sh b/run_tests.sh
index e093a20d3..82c8251ff 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -54,7 +54,7 @@ run_tests() {
 }
 
 run_coverage() {
-    source ci/cover.sh
+    source tests/ci/cover.sh
     run_coverage_test
 }
 
diff --git a/ci/apexlake-verify b/tests/ci/apexlake-verify
similarity index 100%
rename from ci/apexlake-verify
rename to tests/ci/apexlake-verify
diff --git a/ci/cover.sh b/tests/ci/cover.sh
similarity index 100%
rename from ci/cover.sh
rename to tests/ci/cover.sh
diff --git a/ci/docker/Makefile b/tests/ci/docker/Makefile
similarity index 100%
rename from ci/docker/Makefile
rename to tests/ci/docker/Makefile
diff --git a/ci/docker/yardstick-ci/Dockerfile b/tests/ci/docker/yardstick-ci/Dockerfile
similarity index 95%
rename from ci/docker/yardstick-ci/Dockerfile
rename to tests/ci/docker/yardstick-ci/Dockerfile
index 91d29da33..a2164a8a2 100644
--- a/ci/docker/yardstick-ci/Dockerfile
+++ b/tests/ci/docker/yardstick-ci/Dockerfile
@@ -44,7 +44,7 @@ RUN git clone https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR}
 
 # install yardstick + dependencies
 RUN cd ${YARDSTICK_REPO_DIR} && easy_install -U pip
-RUN cd ${YARDSTICK_REPO_DIR} && pip install -r ci/requirements.txt
+RUN cd ${YARDSTICK_REPO_DIR} && pip install -r tests/ci/requirements.txt
 RUN cd ${YARDSTICK_REPO_DIR} && pip install .
 
 ADD http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img /home/opnfv/images/
diff --git a/ci/docker/yardstick-ci/run_tests.sh b/tests/ci/docker/yardstick-ci/run_tests.sh
similarity index 94%
rename from ci/docker/yardstick-ci/run_tests.sh
rename to tests/ci/docker/yardstick-ci/run_tests.sh
index 3b7cea3c5..680a329ca 100755
--- a/ci/docker/yardstick-ci/run_tests.sh
+++ b/tests/ci/docker/yardstick-ci/run_tests.sh
@@ -49,7 +49,7 @@ git checkout master && git pull
 git_checkout $YARDSTICK_BRANCH $YARDSTICK_REPO
 
 # setup the environment
-source $YARDSTICK_REPO_DIR/ci/prepare_env.sh
+source $YARDSTICK_REPO_DIR/tests/ci/prepare_env.sh
 
 # run tests
-$YARDSTICK_REPO_DIR/ci/yardstick-verify $@
+$YARDSTICK_REPO_DIR/tests/ci/yardstick-verify $@
diff --git a/ci/prepare_env.sh b/tests/ci/prepare_env.sh
similarity index 100%
rename from ci/prepare_env.sh
rename to tests/ci/prepare_env.sh
diff --git a/ci/requirements.txt b/tests/ci/requirements.txt
similarity index 100%
rename from ci/requirements.txt
rename to tests/ci/requirements.txt
diff --git a/ci/yardstick-verify b/tests/ci/yardstick-verify
similarity index 100%
rename from ci/yardstick-verify
rename to tests/ci/yardstick-verify