diff options
| -rwxr-xr-x | run_tests.sh | 2 | ||||
| -rwxr-xr-x | tests/ci/apexlake-verify (renamed from ci/apexlake-verify) | 0 | ||||
| -rw-r--r-- | tests/ci/cover.sh (renamed from ci/cover.sh) | 0 | ||||
| -rw-r--r-- | tests/ci/docker/Makefile (renamed from ci/docker/Makefile) | 0 | ||||
| -rw-r--r-- | tests/ci/docker/yardstick-ci/Dockerfile (renamed from ci/docker/yardstick-ci/Dockerfile) | 2 | ||||
| -rwxr-xr-x | tests/ci/docker/yardstick-ci/run_tests.sh (renamed from ci/docker/yardstick-ci/run_tests.sh) | 4 | ||||
| -rwxr-xr-x | tests/ci/prepare_env.sh (renamed from ci/prepare_env.sh) | 0 | ||||
| -rw-r--r-- | tests/ci/requirements.txt (renamed from ci/requirements.txt) | 0 | ||||
| -rwxr-xr-x | tests/ci/yardstick-verify (renamed from ci/yardstick-verify) | 0 |
9 files changed, 4 insertions, 4 deletions
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 index 6a691063f..6a691063f 100755 --- a/ci/apexlake-verify +++ b/tests/ci/apexlake-verify diff --git a/ci/cover.sh b/tests/ci/cover.sh index 71833757a..71833757a 100644 --- a/ci/cover.sh +++ b/tests/ci/cover.sh diff --git a/ci/docker/Makefile b/tests/ci/docker/Makefile index 036d67db3..036d67db3 100644 --- a/ci/docker/Makefile +++ b/tests/ci/docker/Makefile diff --git a/ci/docker/yardstick-ci/Dockerfile b/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 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 index ed832bc47..ed832bc47 100755 --- a/ci/prepare_env.sh +++ b/tests/ci/prepare_env.sh diff --git a/ci/requirements.txt b/tests/ci/requirements.txt index 4d1a16993..4d1a16993 100644 --- a/ci/requirements.txt +++ b/tests/ci/requirements.txt diff --git a/ci/yardstick-verify b/tests/ci/yardstick-verify index c83193574..c83193574 100755 --- a/ci/yardstick-verify +++ b/tests/ci/yardstick-verify |