diff options
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 10 | ||||
| -rw-r--r-- | jjb/opnfv/opnfv-docker.sh | 4 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 8 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-project-jobs.yml | 2 | ||||
| -rwxr-xr-x | jjb/yardstick/yardstick-vtcdaily.sh | 2 | ||||
| -rw-r--r-- | utils/test/dashboard/js/opnfv_dashboard_tests_conf.js | 4 | ||||
| -rw-r--r-- | utils/test/result_collection_api/README.md | 1 |
7 files changed, 16 insertions, 15 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 0af55977f..4b11c4bfc 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -233,28 +233,28 @@ name: functest-suite builders: - shell: - !include-raw-escape: ./functest-suite.sh + !include-raw: ./functest-suite.sh - builder: name: functest-daily builders: - shell: - !include-raw-escape: ./functest-daily.sh + !include-raw: ./functest-daily.sh - builder: name: set-functest-env builders: - shell: - !include-raw-escape: ./set-functest-env.sh + !include-raw: ./set-functest-env.sh - builder: name: functest-store-results builders: - shell: - !include-raw-escape: ../../utils/push-test-logs.sh + !include-raw: ../../utils/push-test-logs.sh - builder: name: functest-cleanup builders: - shell: - !include-raw-escape: ./functest-cleanup.sh + !include-raw: ./functest-cleanup.sh diff --git a/jjb/opnfv/opnfv-docker.sh b/jjb/opnfv/opnfv-docker.sh index 1093d5fec..ef4738482 100644 --- a/jjb/opnfv/opnfv-docker.sh +++ b/jjb/opnfv/opnfv-docker.sh @@ -75,10 +75,10 @@ elif [[ "$DOCKER_REPO_NAME" == "opnfv/functest" ]]; then cd $WORKSPACE/docker elif [[ "$DOCKER_REPO_NAME" == "opnfv/qtip" ]]; then cd $WORKSPACE/docker -elif [[ "$DOCKER_REPO_NAME" == "opnfv/storeperf" ]]; then +elif [[ "$DOCKER_REPO_NAME" == "opnfv/storperf" ]]; then cd $WORKSPACE/docker elif [[ "$DOCKER_REPO_NAME" == "opnfv/yardstick" ]]; then - cd $WORKSPACE/ci/docker/yardstick-ci + cd $WORKSPACE/tests/ci/docker/yardstick-ci else echo "ERROR: DOCKER_REPO_NAME parameter not valid: $DOCKER_REPO_NAME" exit 1 diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 1b17db455..b7c1c0a82 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -218,7 +218,7 @@ publishers: - email: - recipients: ana.cunha@ericsson.com + recipients: jean.gaoliang@huawei.com matthew.lijun@huawei.com ######################## # builder macros @@ -227,13 +227,13 @@ name: yardstick-daily builders: - shell: - !include-raw-escape: ./yardstick-daily.sh + !include-raw: ./yardstick-daily.sh - builder: name: yardstick-vtcdaily builders: - shell: - !include-raw-escape: ./yardstick-vtcdaily.sh + !include-raw: ./yardstick-vtcdaily.sh - builder: name: yardstick-fetch-os-creds @@ -245,7 +245,7 @@ name: yardstick-cleanup builders: - shell: - !include-raw-escape: ./yardstick-cleanup.sh + !include-raw: ./yardstick-cleanup.sh ######################## # parameter macros ######################## diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml index f06bf7077..c6f317386 100644 --- a/jjb/yardstick/yardstick-project-jobs.yml +++ b/jjb/yardstick/yardstick-project-jobs.yml @@ -121,7 +121,7 @@ # install python packages easy_install -U setuptools easy_install -U pip - pip install -r ci/requirements.txt + pip install -r tests/ci/requirements.txt pip install -e . # unit tests diff --git a/jjb/yardstick/yardstick-vtcdaily.sh b/jjb/yardstick/yardstick-vtcdaily.sh index 32408bcc3..737d6806e 100755 --- a/jjb/yardstick/yardstick-vtcdaily.sh +++ b/jjb/yardstick/yardstick-vtcdaily.sh @@ -3,4 +3,4 @@ set -e [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null" cd $WORKSPACE -./ci/apexlake-verify +./tests/ci/apexlake-verify diff --git a/utils/test/dashboard/js/opnfv_dashboard_tests_conf.js b/utils/test/dashboard/js/opnfv_dashboard_tests_conf.js index 4d909c883..6e230d8e4 100644 --- a/utils/test/dashboard/js/opnfv_dashboard_tests_conf.js +++ b/utils/test/dashboard/js/opnfv_dashboard_tests_conf.js @@ -56,13 +56,13 @@ var opnfv_dashboard_testcases = { var opnfv_dashboard_installers_pods = {};
opnfv_dashboard_installers_pods['apex'] = ['all','intel-pod7','opnfv-jump-1'];
opnfv_dashboard_installers_pods['compass'] = ['all','huawei-us-deploy-bare-1','huawei-us-deploy-vm-1','huawei-us-deploy-vm2','intel-pod8'];
-opnfv_dashboard_installers_pods['fuel'] = ['all','ericsson-pod2','opnfv-jump-2','arm-pod1'];
+opnfv_dashboard_installers_pods['fuel'] = ['all','ericsson-pod2','opnfv-jump-2','arm-pod1','zte-pod1'];
opnfv_dashboard_installers_pods['joid'] = ['all','intel-pod5','intel-pod6','orange-fr-pod2'];
var opnfv_dashboard_installers_pods_print = {};
opnfv_dashboard_installers_pods_print['apex'] = ['all','intelpod7','opnfvjump1'];
opnfv_dashboard_installers_pods_print['compass'] = ['all','hwusbare1','hwusvm1','hwusvm2','intelpod8'];
-opnfv_dashboard_installers_pods_print['fuel'] = ['all','ericssonpod2','opnfvjump2','armpod1'];
+opnfv_dashboard_installers_pods_print['fuel'] = ['all','ericssonpod2','opnfvjump2','armpod1','ztepod1'];
opnfv_dashboard_installers_pods_print['joid'] = ['all','intelpod5','intelpod6','orangefrpod2'];
var opnfv_dashboard_file_directory = 'res-test';
diff --git a/utils/test/result_collection_api/README.md b/utils/test/result_collection_api/README.md index d73274c69..2798db6e3 100644 --- a/utils/test/result_collection_api/README.md +++ b/utils/test/result_collection_api/README.md @@ -6,6 +6,7 @@ Install: ``` pip install testtools pip install discover +pip install futures ``` ## How to: |