diff options
| -rw-r--r-- | jjb/3rd_party_ci/odl-netvirt.yaml | 25 | ||||
| -rw-r--r-- | jjb/apex/apex-snapshot-deploy.sh | 6 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml | 10 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 11 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-deploy.sh | 2 | ||||
| -rw-r--r-- | jjb/cperf/cirros-upload.yaml.ansible | 11 | ||||
| -rw-r--r-- | jjb/cperf/cperf-ci-jobs.yaml | 31 | ||||
| -rwxr-xr-x | jjb/cperf/cperf-robot-netvirt-csit.sh | 4 | ||||
| -rw-r--r-- | jjb/cperf/cperf-upload-logs-csit.sh | 10 | ||||
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 2 |
10 files changed, 82 insertions, 30 deletions
diff --git a/jjb/3rd_party_ci/odl-netvirt.yaml b/jjb/3rd_party_ci/odl-netvirt.yaml index 4453ee250..bb7d21e11 100644 --- a/jjb/3rd_party_ci/odl-netvirt.yaml +++ b/jjb/3rd_party_ci/odl-netvirt.yaml @@ -152,7 +152,7 @@ name: csit condition: ALWAYS projects: - - name: cperf-apex-csit-{stream} + - name: cperf-apex-csit-master predefined-parameters: | ODL_BRANCH=$BRANCH RC_FILE_PATH=$SNAP_CACHE/overcloudrc @@ -161,27 +161,16 @@ ODL_CONTAINERIZED=false OS_VERSION=$OS_VERSION node-parameters: true - kill-phase-on: NEVER + kill-phase-on: FAILURE abort-all-job: false - - shell: | - if echo $OS_VERSION | grep queens &> /dev/null; then - echo 'REPO=opnfv' > functest_repo - else - echo 'REPO=ollivier' > functest_repo - fi - - inject: - properties-file: functest_repo - multijob: - name: functest - condition: SUCCESSFUL + name: csit-collect-logs + condition: ALWAYS projects: - - name: 'functest-netvirt-virtual-suite-master' + - name: cperf-upload-logs-csit predefined-parameters: | - DEPLOY_SCENARIO=os-odl-nofeature-$TOPOLOGY - FUNCTEST_MODE=testcase - FUNCTEST_SUITE_NAME=tempest_smoke - RC_FILE_PATH=$HOME/cloner-info/overcloudrc - REPO=$REPO + ODL_BRANCH=$BRANCH + OS_VERSION=$OS_VERSION node-parameters: true kill-phase-on: FAILURE abort-all-job: false diff --git a/jjb/apex/apex-snapshot-deploy.sh b/jjb/apex/apex-snapshot-deploy.sh index 3b8f3ac12..1e47c8297 100644 --- a/jjb/apex/apex-snapshot-deploy.sh +++ b/jjb/apex/apex-snapshot-deploy.sh @@ -33,8 +33,11 @@ if ! wget -O $WORKSPACE/opnfv.properties ${full_snap_url}/snapshot.properties; t exit 1 fi +echo "Properties contents:" +cat ${WORKSPACE}/opnfv.properties + # find latest check sum -latest_snap_checksum=$(cat opnfv.properties | grep OPNFV_SNAP_SHA512SUM | awk -F "=" '{print $2}') +latest_snap_checksum=$(cat ${WORKSPACE}/opnfv.properties | grep OPNFV_SNAP_SHA512SUM | awk -F "=" '{print $2}') if [ -z "$latest_snap_checksum" ]; then echo "ERROR: checksum of latest snapshot from snapshot.properties is null!" exit 1 @@ -49,6 +52,7 @@ if [ -d "$SNAP_CACHE" ]; then latest_snap=$(ls ${SNAP_CACHE} | grep tar.gz | tail -n 1) if [ -n "$latest_snap" ]; then local_snap_checksum=$(sha512sum ${SNAP_CACHE}/${latest_snap} | cut -d' ' -f1) + echo "Local snap checksum is: ${local_snap_checksum}" fi else mkdir -p ${SNAP_CACHE} diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index aabe6ebc7..84e29e95f 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -546,6 +546,11 @@ abort-all-job: true git-revision: false - shell: | + if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then + echo 'REPO=opnfv' > functest_properties + else + echo 'REPO=ollivier' > functest_properties + fi features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p') if [ "$features" == 'queens' ]; then functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-queens-(noha|ha)/\1-nofeature-\2/p') @@ -554,9 +559,9 @@ else functest_scenario=$DEPLOY_SCENARIO fi - echo "DEPLOY_SCENARIO=$functest_scenario" > functest_scenario + echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_properties - inject: - properties-file: functest_scenario + properties-file: functest_properties override-build-parameters: true - multijob: name: 'OPNFV Test Suite' @@ -839,6 +844,7 @@ - 'apex-runner.*' - 'apex-daily.*' - 'apex-csit-promote.*' + - 'odl-netvirt.*' - throttle: max-per-node: 1 max-total: 10 diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 34594ccf0..4f424b6df 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -416,6 +416,11 @@ abort-all-job: true git-revision: false - shell: | + if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then + echo 'REPO=opnfv' > functest_properties + else + echo 'REPO=ollivier' > functest_properties + fi features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p') if [ "$features" == 'queens' ]; then functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-queens-(noha|ha)/\1-nofeature-\2/p') @@ -424,9 +429,9 @@ else functest_scenario=$DEPLOY_SCENARIO fi - echo "DEPLOY_SCENARIO=$functest_scenario" > functest_scenario + echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_properties - inject: - properties-file: functest_scenario + properties-file: functest_properties override-build-parameters: true - multijob: name: 'OPNFV Test Suite' @@ -709,6 +714,7 @@ - 'apex-runner.*' - 'apex-daily.*' - 'apex-csit-promote.*' + - 'odl-netvirt.*' - throttle: max-per-node: 1 max-total: 10 @@ -1115,4 +1121,3 @@ name: 'apex-danube' triggers: - timed: '0 3 1 1 7' - diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh index ac649b992..4c5448e33 100644 --- a/jjb/compass4nfv/compass-deploy.sh +++ b/jjb/compass4nfv/compass-deploy.sh @@ -35,6 +35,8 @@ export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION} if [[ "${DEPLOY_SCENARIO}" =~ "-ocl" ]]; then export NETWORK_CONF_FILE=network_ocl.yml +elif [[ "${DEPLOY_SCENARIO}" =~ "-odl" ]]; then + export NETWORK_CONF_FILE=network_odl.yml elif [[ "${DEPLOY_SCENARIO}" =~ "-onos" ]]; then export NETWORK_CONF_FILE=network_onos.yml elif [[ "${DEPLOY_SCENARIO}" =~ "-openo" ]]; then diff --git a/jjb/cperf/cirros-upload.yaml.ansible b/jjb/cperf/cirros-upload.yaml.ansible index bdf5c55c0..bd7d78974 100644 --- a/jjb/cperf/cirros-upload.yaml.ansible +++ b/jjb/cperf/cirros-upload.yaml.ansible @@ -2,7 +2,7 @@ - hosts: all tasks: - copy: - src: "{{ item }}" + src: "{{ lookup('env', 'WORKSPACE') }}/{{ item }}" dest: "/home/heat-admin/{{ item }}" owner: heat-admin group: heat-admin @@ -12,6 +12,11 @@ - overcloudrc - name: Upload cirros glance image shell: > - source /home/heat-admin/overcloudrc && openstack image create cirros - --public --file /home/heat-admin/cirros-0.3.5-x86_64-disk.img + source /home/heat-admin/overcloudrc && openstack image create + cirros-0.3.5-x86_64-disk --public + --file /home/heat-admin/cirros-0.3.5-x86_64-disk.img --disk-format qcow2 --container-format bare + - name: Create nano flavor + shell: > + source /home/heat-admin/overcloudrc && openstack flavor create + --id 42 --ram 64 --disk 0 --vcpus 1 m1.nano diff --git a/jjb/cperf/cperf-ci-jobs.yaml b/jjb/cperf/cperf-ci-jobs.yaml index 59afb89c8..efcf51faa 100644 --- a/jjb/cperf/cperf-ci-jobs.yaml +++ b/jjb/cperf/cperf-ci-jobs.yaml @@ -22,6 +22,7 @@ jobs: - 'cperf-{installer}-{testsuite}-{stream}' + - 'cperf-upload-logs-csit' ################################ # job template @@ -54,6 +55,31 @@ builders: - 'cperf-{testsuite}-builder' +- job-template: + name: 'cperf-upload-logs-csit' + + concurrent: true + + disabled: false + + parameters: + - cperf-parameter: + testsuite: 'csit' + gs-pathname: '{gs-pathname}' + docker-tag: '{docker-tag}' + stream: '{stream}' + + # yamllint enable rule:line-length + properties: + - logrotate-default + - throttle: + max-per-node: 1 + max-total: 10 + option: 'project' + + builders: + - 'cperf-upload-logs-csit' + ######################## # parameter macros ######################## @@ -188,3 +214,8 @@ docker rmi opnfv/cperf:$tag >/dev/null done fi + +- builder: + name: cperf-upload-logs-csit + builders: + - shell: !include-raw: ./cperf-upload-logs-csit.sh diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh index 9abb4ad7f..3d943e1be 100755 --- a/jjb/cperf/cperf-robot-netvirt-csit.sh +++ b/jjb/cperf/cperf-robot-netvirt-csit.sh @@ -69,6 +69,7 @@ fi # FIXME(trozet) remove this once it is fixed in csit # Upload glance image into openstack wget -O ${WORKSPACE}/cirros-0.3.5-x86_64-disk.img http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img +export ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i ${CONTROLLER_1_IP}, -u heat-admin --key-file ${WORKSPACE}/id_rsa ${REL_PATH}/cirros-upload.yaml.ansible -vvv LOGS_LOCATION=/tmp/robot_results @@ -76,7 +77,6 @@ LOGS_LOCATION=/tmp/robot_results robot_cmd="pybot \ --removekeywords wuks \ --xunit robotxunit.xml \ - -c critical \ -e exclude \ -d $LOGS_LOCATION \ -v BUNDLEFOLDER:/opt/opendaylight \ @@ -87,7 +87,7 @@ robot_cmd="pybot \ -v DEVSTACK_DEPLOY_PATH:/tmp \ -v HA_PROXY_IP:$SDN_CONTROLLER_IP \ -v NUM_ODL_SYSTEM:$NUM_CONTROL_NODES \ - -v NUM_OS_SYSTEM:$NUM_CONTROL_NODES \ + -v NUM_OS_SYSTEM:$(($NUM_CONTROL_NODES + $NUM_COMPUTE_NODES)) \ -v NUM_TOOLS_SYSTEM:0 \ -v ODL_SNAT_MODE:conntrack \ -v ODL_STREAM:$ODL_STREAM \ diff --git a/jjb/cperf/cperf-upload-logs-csit.sh b/jjb/cperf/cperf-upload-logs-csit.sh new file mode 100644 index 000000000..7bf91df8b --- /dev/null +++ b/jjb/cperf/cperf-upload-logs-csit.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +set -o errexit +set -o nounset +set -o pipefail + +LOGS_LOCATION=/tmp/robot_results +UPLOAD_LOCATION=artifacts.opnfv.org/cperf/cperf-apex-csit-${ODL_BRANCH}/${BUILD_NUMBER}/ +echo "Uploading robot logs to ${UPLOAD_LOCATION}" +gsutil -m cp -r -v ${LOGS_LOCATION} gs://${UPLOAD_LOCATION} > gsutil.latest_logs.log diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index 3268760d6..ecc75bc4b 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -212,7 +212,7 @@ EOF elif [ "$INSTALLER_TYPE" == "fuel" ]; then cat << EOF >> ${DOVETAIL_CONFIG}/pod.yaml process_info: -- {testcase_name: dovetail.ha.cinder_api, attack_process: cinder_wsgi} +- {testcase_name: dovetail.ha.cinder_api, attack_process: cinder-wsgi} - {testcase_name: dovetail.ha.rabbitmq, attack_process: rabbitmq-server, attack_host: msg01} - {testcase_name: dovetail.ha.neutron_l3_agent, attack_process: neutron-l3-agent, attack_host: cmp01} - {testcase_name: dovetail.ha.database, attack_process: mysqld, attack_host: dbs01} |