diff options
| -rw-r--r-- | jjb/global/slave-params.yml | 13 | ||||
| -rwxr-xr-x | jjb/infra/bifrost-verify.sh | 35 | ||||
| -rw-r--r-- | jjb/opera/opera-daily-jobs.yml | 30 | ||||
| -rw-r--r-- | jjb/releng/testapi-automate.yml | 6 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-project-jobs.yml | 2 | ||||
| -rwxr-xr-x | utils/fetch_os_creds.sh | 8 | ||||
| -rwxr-xr-x | utils/test/testapi/run_test.sh | 14 |
7 files changed, 77 insertions, 31 deletions
diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index 9d08487a3..d05b7b562 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -439,6 +439,19 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT - parameter: + name: 'huawei-virtual7-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - huawei-virtual7 + default-slaves: + - huawei-virtual7 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT +- parameter: name: 'huawei-pod7-defaults' parameters: - node: diff --git a/jjb/infra/bifrost-verify.sh b/jjb/infra/bifrost-verify.sh index dbe39762c..a7ef9c43f 100755 --- a/jjb/infra/bifrost-verify.sh +++ b/jjb/infra/bifrost-verify.sh @@ -24,16 +24,17 @@ function upload_logs() { gsutil -q cp -Z ${WORKSPACE}/build_log.txt ${BIFROST_GS_URL}/build_log.txt rm ${WORKSPACE}/build_log.txt - [[ ! -d ${WORKSPACE}/logs ]] && exit 0 - - pushd ${WORKSPACE}/logs/ &> /dev/null - for x in *.log; do - echo "Compressing and uploading $x" - gsutil -q cp -Z ${x} ${BIFROST_GS_URL}/${x} - done + if [[ -d ${WORKSPACE}/logs ]]; then + pushd ${WORKSPACE}/logs &> /dev/null + for x in *.log; do + echo "Compressing and uploading $x" + gsutil -q cp -Z ${x} ${BIFROST_GS_URL}/${x} + done + popd &> /dev/null + fi echo "Generating the landing page" - cat > index.html <<EOF + cat > ${WORKSPACE}/index.html <<EOF <html> <h1>Build results for <a href=https://$GERRIT_NAME/#/c/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER>$GERRIT_NAME/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER</a></h1> <h2>Job: $JOB_NAME</h2> @@ -41,20 +42,22 @@ function upload_logs() { <li><a href=${BIFROST_LOG_URL}/build_log.txt>build_log.txt</a></li> EOF - for x in *.log; do - echo "<li><a href=${BIFROST_LOG_URL}/${x}>${x}</a></li>" >> index.html - done + if [[ -d ${WORKSPACE}/logs ]]; then + pushd ${WORKSPACE}/logs &> /dev/null + for x in *.log; do + echo "<li><a href=${BIFROST_LOG_URL}/${x}>${x}</a></li>" >> ${WORKSPACE}/index.html + done + popd &> /dev/null + fi - cat >> index.html << EOF + cat >> ${WORKSPACE}/index.html << EOF </ul> </html> EOF - gsutil -q cp index.html ${BIFROST_GS_URL}/index.html - - rm index.html + gsutil -q cp ${WORKSPACE}/index.html ${BIFROST_GS_URL}/index.html - popd &> /dev/null + rm ${WORKSPACE}/index.html } function fix_ownership() { diff --git a/jjb/opera/opera-daily-jobs.yml b/jjb/opera/opera-daily-jobs.yml index 76aeb741e..b0755446e 100644 --- a/jjb/opera/opera-daily-jobs.yml +++ b/jjb/opera/opera-daily-jobs.yml @@ -63,7 +63,9 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'huawei-pod7-defaults' + - 'huawei-virtual7-defaults' + - 'compass-defaults' + - 'opera-compass-parameter' builders: - description-setter: @@ -81,7 +83,7 @@ name: deploy condition: SUCCESSFUL projects: - - name: 'opera-daily-deploy-{stream}' + - name: 'compass-deploy-virtual-daily-{stream}' current-parameters: true node-parameters: true kill-phase-on: FAILURE @@ -143,3 +145,27 @@ #!/bin/bash echo "Hello world!" +######################## +# parameter macros +######################## +- parameter: + name: opera-compass-parameter + parameters: + - string: + name: BUILD_DIRECTORY + default: $WORKSPACE/build_output + description: "Directory where the build artifact will be located upon the completion of the build." + - string: + name: GS_URL + default: '$GS_BASE{gs-pathname}' + description: "URL to Google Storage." + - choice: + name: COMPASS_OPENSTACK_VERSION + choices: + - 'newton' + - string: + name: DEPLOY_SCENARIO + default: 'os-nosdn-openo-noha' + - string: + name: COMPASS_OS_VERSION + default: 'xenial' diff --git a/jjb/releng/testapi-automate.yml b/jjb/releng/testapi-automate.yml index 5102083bd..8332f5bb4 100644 --- a/jjb/releng/testapi-automate.yml +++ b/jjb/releng/testapi-automate.yml @@ -58,7 +58,7 @@ branch-pattern: '**/{branch}' file-paths: - compare-type: 'ANT' - pattern: 'utils/**' + pattern: 'utils/test/testapi/**' builders: - run-unit-tests @@ -69,8 +69,8 @@ - cobertura: report-file: "coverage.xml" only-stable: "true" - health-auto-update: "true" - stability-auto-update: "true" + health-auto-update: "false" + stability-auto-update: "false" zoom-coverage-chart: "true" targets: - files: diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml index a54750ef7..1da4f3134 100644 --- a/jjb/yardstick/yardstick-project-jobs.yml +++ b/jjb/yardstick/yardstick-project-jobs.yml @@ -116,7 +116,7 @@ source $WORKSPACE/yardstick_venv/bin/activate # install python packages - easy_install -U setuptools + easy_install -U setuptools==33.1.1 easy_install -U pip pip install -r requirements.txt || pip install -r tests/ci/requirements.txt pip install -e . diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh index 856f69a27..c1e21f316 100755 --- a/utils/fetch_os_creds.sh +++ b/utils/fetch_os_creds.sh @@ -121,6 +121,14 @@ if [ "$installer_type" == "fuel" ]; then # but sometimes the output of endpoint-list is like this: http://172.30.9.70:8004/v1/%(tenant_id)s # Fuel virtual need a fix + #convert to v3 URL + auth_url=$(cat $dest_path|grep AUTH_URL) + if [[ -z `echo $auth_url |grep v3` ]]; then + auth_url=$(echo $auth_url |sed "s|'$|v3&|") + fi + sed -i '/AUTH_URL/d' $dest_path + echo $auth_url >> $dest_path + elif [ "$installer_type" == "apex" ]; then verify_connectivity $installer_ip diff --git a/utils/test/testapi/run_test.sh b/utils/test/testapi/run_test.sh index d1f05f201..51db09f65 100755 --- a/utils/test/testapi/run_test.sh +++ b/utils/test/testapi/run_test.sh @@ -5,20 +5,16 @@ set -o errexit # Get script directory SCRIPTDIR=`dirname $0` -# Either Workspace is set (CI) -if [ -z $WORKSPACE ] -then - WORKSPACE="." -fi - echo "Running unit tests..." # Creating virtual environment -virtualenv $WORKSPACE/testapi_venv -source $WORKSPACE/testapi_venv/bin/activate +virtualenv $SCRIPTDIR/testapi_venv +source $SCRIPTDIR/testapi_venv/bin/activate # Install requirements pip install -r $SCRIPTDIR/requirements.txt +pip install coverage +pip install nose>=1.3.1 find . -type f -name "*.pyc" -delete @@ -26,7 +22,7 @@ nosetests --with-xunit \ --with-coverage \ --cover-erase \ --cover-package=$SCRIPTDIR/opnfv_testapi/cmd \ - --cover-package=$SCRIPTDIR/opnfv_testapi/commonn \ + --cover-package=$SCRIPTDIR/opnfv_testapi/common \ --cover-package=$SCRIPTDIR/opnfv_testapi/resources \ --cover-package=$SCRIPTDIR/opnfv_testapi/router \ --cover-xml \ |