diff options
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 12 | ||||
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 2 | ||||
| -rw-r--r-- | jjb/functest/functest.yaml | 36 | ||||
| -rw-r--r-- | jjb/nfvbench/nfvbench.yaml | 5 | ||||
| -rw-r--r-- | jjb/releng/releng-release-create-venv.sh | 3 | ||||
| -rwxr-xr-x | jjb/xci/xci-set-scenario.sh | 40 |
6 files changed, 60 insertions, 38 deletions
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index ef11fc15a..0440c4beb 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -206,13 +206,13 @@ get_fuel_baremetal_pod_file() { cat << EOF >${POD} nodes: -- {ip: ${INSTALLER_IP}, name: node0, key_filename: /home/opnfv/userconfig/pre_config/id_rsa, +- {ip: ${INSTALLER_IP}, name: node0, key_filename: ${DOVETAIL_CONFIG}/id_rsa, role: Jumpserver, user: ${ssh_user}} -- {ip: ${fuel_ctl_ip}, name: node1, key_filename: /home/opnfv/userconfig/pre_config/id_rsa, +- {ip: ${fuel_ctl_ip}, name: node1, key_filename: ${DOVETAIL_CONFIG}/id_rsa, role: controller, user: ${ssh_user}, ipmi_ip: ${ipmiIp}, ipmi_user: ${ipmiUser}, ipmi_password: ${ipmiPass}} -- {ip: ${fuel_msg_ip}, name: msg01, key_filename: /home/opnfv/userconfig/pre_config/id_rsa, role: controller, user: ${ssh_user}} -- {ip: ${fuel_cmp_ip}, name: cmp01, key_filename: /home/opnfv/userconfig/pre_config/id_rsa, role: controller, user: ${ssh_user}} -- {ip: ${fuel_dbs_ip}, name: dbs01, key_filename: /home/opnfv/userconfig/pre_config/id_rsa, role: controller, user: ${ssh_user}} +- {ip: ${fuel_msg_ip}, name: msg01, key_filename: ${DOVETAIL_CONFIG}/id_rsa, role: controller, user: ${ssh_user}} +- {ip: ${fuel_cmp_ip}, name: cmp01, key_filename: ${DOVETAIL_CONFIG}/id_rsa, role: controller, user: ${ssh_user}} +- {ip: ${fuel_dbs_ip}, name: dbs01, key_filename: ${DOVETAIL_CONFIG}/id_rsa, role: controller, user: ${ssh_user}} EOF } @@ -241,7 +241,7 @@ get_pod_file_with_scripts() { cmd="sudo python ${releng_repo}/utils/create_pod_file.py -t ${INSTALLER_TYPE} \ -i ${INSTALLER_IP} ${options} -f ${POD} \ - -s /home/opnfv/userconfig/pre_config/id_rsa" + -s ${DOVETAIL_CONFIG}/id_rsa" echo "INFO: cmd is ${cmd}" ${cmd} diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 9961f717e..37189f84a 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -114,7 +114,7 @@ if [ "${INSTALLER_TYPE}" == 'fuel' ]; then COMPUTE_ARCH=$(ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \ "sudo salt 'cmp*' grains.get cpuarch --out yaml | awk '{print \$2; exit}'") IMAGE_PROPERTIES="hw_disk_bus:scsi,hw_scsi_model:virtio-scsi" - envs="${envs} -e POD_ARCH=${COMPUTE_ARCH}" + envs="${envs} -e POD_ARCH=${COMPUTE_ARCH} -e BLOCK_MIGRATION=false" fi if [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_SCENARIO} == 'os-nosdn-nofeature-noha' ]]; then diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index 4a60c6484..8fe365958 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -99,14 +99,21 @@ else image={repo}:{port}/{container}:{tag} fi + if [ "{tag}" = "latest" ]; then + py=3.6 + else + py=2.7 + fi sudo docker run --rm \ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ -e DEBUG=True \ -e EXTERNAL_NETWORK=public \ -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \ -v /home/opnfv/functest/images:/home/opnfv/functest/images \ - -v /home/opnfv/functest/blacklist.yaml:/usr/lib/python2.7/\ + -v /home/opnfv/functest/blacklist.yaml:/usr/lib/python$py/\ site-packages/functest/opnfv_tests/openstack/rally/blacklist.yaml \ + -v /home/opnfv/functest/tempest_blacklist.yaml:/usr/lib/python$py/\ + site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml \ $image run_tests -t {test} res=$? gsutil -m cp -r $WORKSPACE/ \ @@ -369,8 +376,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-healthcheck:{tag} - execution-type: PARALLEL - condition: ALWAYS projects: - name: 'functest-opnfv-functest-healthcheck-{tag}-connection_check-run' <<: *functest-jobs @@ -398,8 +403,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-smoke:{tag} - execution-type: PARALLEL - condition: SUCCESSFUL projects: - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' <<: *functest-jobs @@ -429,8 +432,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-benchmarking:{tag} - execution-type: PARALLEL - condition: ALWAYS projects: - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run' <<: *functest-jobs @@ -443,7 +444,6 @@ - multijob: name: opnfv/functest-vnf:{tag} execution-type: SEQUENTIALLY - condition: ALWAYS projects: - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run' <<: *functest-jobs @@ -457,8 +457,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-features:{tag} - execution-type: PARALLEL - condition: ALWAYS projects: - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run' <<: *functest-jobs @@ -652,8 +650,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-healthcheck:{tag} - execution-type: PARALLEL - condition: ALWAYS projects: - name: 'functest-opnfv-functest-healthcheck-{tag}-connection_check-run' <<: *functest-jobs @@ -681,8 +677,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-smoke:{tag} - execution-type: PARALLEL - condition: SUCCESSFUL projects: - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' <<: *functest-jobs @@ -712,8 +706,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-benchmarking:{tag} - execution-type: PARALLEL - condition: ALWAYS projects: - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run' <<: *functest-jobs @@ -726,7 +718,6 @@ - multijob: name: opnfv/functest-vnf:{tag} execution-type: SEQUENTIALLY - condition: ALWAYS projects: - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run' <<: *functest-jobs @@ -740,8 +731,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-features:{tag} - execution-type: PARALLEL - condition: ALWAYS projects: - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run' <<: *functest-jobs @@ -841,8 +830,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-healthcheck:{tag} - execution-type: PARALLEL - condition: ALWAYS projects: - name: 'functest-opnfv-functest-healthcheck-{tag}-connection_check-run' <<: *functest-jobs @@ -870,8 +857,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-smoke:{tag} - execution-type: PARALLEL - condition: SUCCESSFUL projects: - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' <<: *functest-jobs @@ -901,8 +886,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-benchmarking:{tag} - execution-type: PARALLEL - condition: ALWAYS projects: - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run' <<: *functest-jobs @@ -915,7 +898,6 @@ - multijob: name: opnfv/functest-vnf:{tag} execution-type: SEQUENTIALLY - condition: ALWAYS projects: - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run' <<: *functest-jobs @@ -929,8 +911,6 @@ <<: *functest-jobs - multijob: name: opnfv/functest-features:{tag} - execution-type: PARALLEL - condition: ALWAYS projects: - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run' <<: *functest-jobs diff --git a/jjb/nfvbench/nfvbench.yaml b/jjb/nfvbench/nfvbench.yaml index ec6776f81..a9efb272a 100644 --- a/jjb/nfvbench/nfvbench.yaml +++ b/jjb/nfvbench/nfvbench.yaml @@ -44,8 +44,7 @@ - gerrit: server-name: 'gerrit.opnfv.org' trigger-on: - - comment-added-contains-event: - comment-contains-value: 'buildvm' + - change-merged-event projects: - project-compare-type: 'ANT' project-pattern: '{project}' @@ -96,3 +95,5 @@ builders: - shell: | cd $WORKSPACE && tox + cd $WORKSPACE/nfvbenchvm/dib + bash verify-image.sh -v diff --git a/jjb/releng/releng-release-create-venv.sh b/jjb/releng/releng-release-create-venv.sh index de585fdb3..0200376a7 100644 --- a/jjb/releng/releng-release-create-venv.sh +++ b/jjb/releng/releng-release-create-venv.sh @@ -11,7 +11,8 @@ set -e -o pipefail echo "---> Create virtualenv" sudo -H pip install virtualenv -virtualenv $WORKSPACE/venv +virtualenv -p /usr/bin/python3 $WORKSPACE/venv + # shellcheck source=$WORKSPACE/venv/bin/activate disable=SC1091 source $WORKSPACE/venv/bin/activate pip install --upgrade pip diff --git a/jjb/xci/xci-set-scenario.sh b/jjb/xci/xci-set-scenario.sh index 59c1ebf6e..2c35f2780 100755 --- a/jjb/xci/xci-set-scenario.sh +++ b/jjb/xci/xci-set-scenario.sh @@ -153,6 +153,45 @@ function determine_scenario() { SCENARIO_SHA=$(cd $WORK_DIRECTORY/$GERRIT_PROJECT && git rev-parse HEAD) } +# This function allows developers to specify the specific XCI flavor for the +# impacted scenario by adding the XCI Flavor info about the specific scenario. +# This results in either skipping the real verification +# totally or skipping the determining the installer and scenario programmatically. +# It is important to note that this feature is only available to generic scenarios +# and only single installer/scenario pair is allowed. +# The input in commit message should be placed at the end of the commit message body, +# before the signed-off and change-id lines. +# +# Pattern to be searched in Commit Message +# xci-flavor:<xci-flavor> +# Examples: +# xci-flavor:noha +function override_xci_flavor() { + echo "Processing $GERRIT_PROJECT patchset $GERRIT_REFSPEC" + + # process commit message for XCI Flavor + if [[ "$GERRIT_CHANGE_COMMIT_MESSAGE" =~ "xci-flavor:" ]]; then + XCI_FLAVOR=$(echo $GERRIT_CHANGE_COMMIT_MESSAGE | awk '/xci-flavor:/' RS=" " | cut -d":" -f2) + + if [[ -z "$XCI_FLAVOR" ]]; then + XCI_FLAVOR='mini' + echo "XCI flavor is not specified. The default is specified instead (i.e. mini). Falling back to programmatically determining them." + echo "XCI_FLAVOR=mini" >> $WORK_DIRECTORY/scenario.properties + exit 0 + else + echo "Recording the XCI flavor '$XCI_FLAVOR' for downstream jobs" + echo "XCI_FLAVOR=$XCI_FLAVOR" >> $WORK_DIRECTORY/scenario.properties + exit 0 + fi + else + XCI_FLAVOR='mini' + echo "XCI flavor is not specified. The default is specified instead (i.e. mini). Falling back to programmatically determining them." + echo "XCI_FLAVOR=mini" >> $WORK_DIRECTORY/scenario.properties + exit 0 + fi + +} + echo "Determining the impacted scenario" declare -a DEPLOY_SCENARIO @@ -169,6 +208,7 @@ if [[ $GERRIT_PROJECT == "releng-xci" ]]; then determine_default_scenario else determine_scenario + override_xci_flavor fi override_scenario |