diff options
| -rw-r--r-- | jjb/armband/armband-ci-jobs.yml | 6 | ||||
| -rwxr-xr-x | jjb/armband/armband-deploy.sh | 7 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 24 | ||||
| -rwxr-xr-x | prototypes/bifrost/scripts/test-bifrost-deployment.sh | 22 | ||||
| -rw-r--r-- | utils/push-test-logs.sh | 10 | ||||
| -rw-r--r-- | utils/test/scripts/backup-db.sh | 12 | ||||
| -rw-r--r-- | utils/test/scripts/mongo_to_elasticsearch.py | 42 |
7 files changed, 67 insertions, 56 deletions
diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index 9493cd8f1..bffa91d31 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -235,7 +235,7 @@ triggers: - timed: '0 3 * * 5' #---------------------------------------------------------------------- -# Enea Armband CI Baremetal Triggers running against brahmaputra branch +# Enea Armband CI Baremetal Triggers running against colorado branch #---------------------------------------------------------------------- - trigger: name: 'armband-fuel-os-odl_l2-nofeature-ha-baremetal-colorado-trigger' @@ -281,7 +281,7 @@ triggers: - timed: '' #-------------------------------------------------------------------- -# Enea Armband CI Virtual Triggers running against brahmaputra branch +# Enea Armband CI Virtual Triggers running against colorado branch #-------------------------------------------------------------------- - trigger: name: 'armband-fuel-os-odl_l2-nofeature-ha-virtual-colorado-trigger' @@ -327,7 +327,7 @@ triggers: - timed: '' #--------------------------------------------------------------- -# Enea Armband POD 2 Triggers running against brahmaputra branch +# Enea Armband POD 2 Triggers running against colorado branch #--------------------------------------------------------------- - trigger: name: 'armband-fuel-os-odl_l2-nofeature-ha-arm-pod2-colorado-trigger' diff --git a/jjb/armband/armband-deploy.sh b/jjb/armband/armband-deploy.sh index 901f845bf..fb4c1ead5 100755 --- a/jjb/armband/armband-deploy.sh +++ b/jjb/armband/armband-deploy.sh @@ -50,6 +50,13 @@ if [[ $LAB_CONFIG_URL =~ ^(git|ssh):// ]]; then echo "cloning $LAB_CONFIG_URL" git clone --quiet --branch ${GIT_BRANCH##origin/} $LAB_CONFIG_URL lab-config LAB_CONFIG_URL=file://${WORKSPACE}/lab-config + + # Source local_env if present, which contains POD-specific config + local_env="${WORKSPACE}/lab-config/labs/$LAB_NAME/$POD_NAME/fuel/config/local_env" + if [ -e $local_env ]; then + echo "-- Sourcing local environment file" + source $local_env + fi fi # releng wants us to use nothing else but opnfv.iso for now. We comply. diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 608ce43de..0c8435d6e 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -160,6 +160,10 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' + - string: + name: LAB_CONFIG_URL + default: ssh://git@git.enea.com/pharos/lab-config + description: 'Base URI to the configuration directory' - parameter: name: 'joid-baremetal-defaults' parameters: @@ -221,6 +225,10 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' + - string: + name: LAB_CONFIG_URL + default: ssh://git@git.enea.com/pharos/lab-config + description: 'Base URI to the configuration directory' - parameter: name: 'joid-virtual-defaults' parameters: @@ -610,14 +618,6 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - string: - name: DEFAULT_BRIDGE - default: 'admin6_br0,public6_br0' - desciption: 'The bridge to use for Fuel PXE booting. It can be a comma sparated list of bridges, in which case the first is the PXE boot bridge, and all subsequent interfaces that will be added to the VM. If left empty, most deploy scripts will default to pxebr.' - - string: - name: DEPLOY_TIMEOUT - default: '360' - description: 'Deployment timeout in minutes' - - string: name: LAB_CONFIG_URL default: ssh://git@git.enea.com/pharos/lab-config description: 'Base URI to the configuration directory' @@ -636,14 +636,6 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - string: - name: DEFAULT_BRIDGE - default: 'admin_br0,public_br0' - desciption: 'The bridge to use for Fuel PXE booting. It can be a comma sparated list of bridges, in which case the first is the PXE boot bridge, and all subsequent interfaces that will be added to the VM. If left empty, most deploy scripts will default to pxebr.' - - string: - name: DEPLOY_TIMEOUT - default: '360' - description: 'Deployment timeout in minutes' - - string: name: LAB_CONFIG_URL default: ssh://git@git.enea.com/pharos/lab-config description: 'Base URI to the configuration directory' diff --git a/prototypes/bifrost/scripts/test-bifrost-deployment.sh b/prototypes/bifrost/scripts/test-bifrost-deployment.sh index 66affe9a7..d796f3509 100755 --- a/prototypes/bifrost/scripts/test-bifrost-deployment.sh +++ b/prototypes/bifrost/scripts/test-bifrost-deployment.sh @@ -71,17 +71,17 @@ set -x -o nounset cd $BIFROST_HOME/playbooks # Syntax check of dynamic inventory test path -${ANSIBLE} -vvvv \ - -i inventory/localhost \ - test-bifrost-create-vm.yaml \ - --syntax-check \ - --list-tasks -${ANSIBLE} -vvvv \ - -i inventory/localhost \ - ${TEST_PLAYBOOK} \ - --syntax-check \ - --list-tasks \ - -e testing_user=${TESTING_USER} +for task in syntax-check list-tasks; do + ${ANSIBLE} -vvvv \ + -i inventory/localhost \ + test-bifrost-create-vm.yaml \ + --${task} + ${ANSIBLE} -vvvv \ + -i inventory/localhost \ + ${TEST_PLAYBOOK} \ + --${task} \ + -e testing_user=${TESTING_USER} +done # Create the test VMS ${ANSIBLE} -vvvv \ diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh index 24b3281e8..0fa882bc9 100644 --- a/utils/push-test-logs.sh +++ b/utils/push-test-logs.sh @@ -54,8 +54,14 @@ if [ -d "$dir_result" ]; then if [ $? != 0 ]; then echo "Not possible to push results to artifact: gsutil not installed."; else - echo "copy result files to artifact $project_artifact" - gsutil -m cp -r "$dir_result" gs://artifacts.opnfv.org/"$project_artifact"/ >/dev/null 2>&1 + echo "Uploading logs to artifact $project_artifact" + gsutil -m cp -r "$dir_result"/* gs://artifacts.opnfv.org/"$project_artifact"/ >/dev/null 2>&1 + echo "Logs can be found in http://artifacts.opnfv.org/logs_${project}_${testbed}.html" + cd $dir_result + files=($(find . -name \* -print|sed 's/^\.//'|sed '/^\s*$/d')) + for f in ${files[@]}; do + echo "http://artifacts.opnfv.org/${project_artifact}${f}" + done fi fi else diff --git a/utils/test/scripts/backup-db.sh b/utils/test/scripts/backup-db.sh index aa36aa370..35c3fbe5a 100644 --- a/utils/test/scripts/backup-db.sh +++ b/utils/test/scripts/backup-db.sh @@ -18,16 +18,16 @@ echo "Create Directory for backup" mkdir -p $TARGET_DIR echo "Export results" -mongoexport -db test_results_collection -c test_results --out $TARGET_DIR/results.json +mongoexport --db test_results_collection -c results --out $TARGET_DIR/backup-results.json echo "Export test cases" -mongoexport --db test_results_collection -c test_cases --out $TARGET_DIR/backup-cases.json +mongoexport --db test_results_collection -c testcases --out $TARGET_DIR/backup-cases.json echo "Export projects" -mongoexport --db test_results_collection -c test_projects --out $TARGET_DIR/backup-projects.json +mongoexport --db test_results_collection -c projects --out $TARGET_DIR/backup-projects.json echo "Export pods" -mongoexport --db test_results_collection -c pod --out $TARGET_DIR/backup-pod.json +mongoexport --db test_results_collection -c pods --out $TARGET_DIR/backup-pod.json echo "Create tar.gz" -tar -cvzf $TEST_RESULT_DB_BACKUP $TARGET_DIR +#tar -cvzf $TEST_RESULT_DB_BACKUP $TARGET_DIR echo "Delete temp directory" -rm -Rf $TARGET_DIR +#rm -Rf $TARGET_DIR diff --git a/utils/test/scripts/mongo_to_elasticsearch.py b/utils/test/scripts/mongo_to_elasticsearch.py index 2ffbc1713..ded58ef4c 100644 --- a/utils/test/scripts/mongo_to_elasticsearch.py +++ b/utils/test/scripts/mongo_to_elasticsearch.py @@ -1,13 +1,16 @@ #! /usr/bin/env python -import logging -import argparse -import shared_utils +import datetime import json -import urlparse -import uuid +import logging import os import subprocess -import datetime +import traceback +import urlparse +import uuid + +import argparse + +import shared_utils logger = logging.getLogger('mongo_to_elasticsearch') logger.setLevel(logging.DEBUG) @@ -370,18 +373,21 @@ def modify_mongo_entry(testcase): project = testcase['project_name'] case_name = testcase['case_name'] logger.info("Processing mongo test case '{}'".format(case_name)) - if project == 'functest': - if case_name == 'rally_sanity': - return modify_functest_rally(testcase) - elif case_name.lower() == 'odl': - return modify_functest_odl(testcase) - elif case_name.lower() == 'onos': - return modify_functest_onos(testcase) - elif case_name.lower() == 'vims': - return modify_functest_vims(testcase) - elif case_name == 'tempest_smoke_serial': - return modify_functest_tempest(testcase) - return modify_default_entry(testcase) + try: + if project == 'functest': + if case_name == 'rally_sanity': + return modify_functest_rally(testcase) + elif case_name.lower() == 'odl': + return modify_functest_odl(testcase) + elif case_name.lower() == 'onos': + return modify_functest_onos(testcase) + elif case_name.lower() == 'vims': + return modify_functest_vims(testcase) + elif case_name == 'tempest_smoke_serial': + return modify_functest_tempest(testcase) + return modify_default_entry(testcase) + except Exception: + logger.error("Fail in modify testcase[%s]\nerror message: %s" % (testcase, traceback.format_exc())) else: return False |