X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fxci-daily-jobs.yaml;h=6f1ce39a0787e1090783f61a26eba37c973ad231;hb=1a1c8970989d9a4d7bb1010c8cb4d9a5be15b66f;hp=bfc68e20d0430097a7346815a00f8bda13d85d0d;hpb=0f2c71c2dfac27dbc5b16a0d466dbdd8e902a3b3;p=releng.git diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml index bfc68e20d..6f1ce39a0 100644 --- a/jjb/xci/xci-daily-jobs.yaml +++ b/jjb/xci/xci-daily-jobs.yaml @@ -17,57 +17,46 @@ # ------------------------------- scenario: - 'os-nosdn-nofeature-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'os-nosdn-nofeature' installer-type: 'osa' xci-flavor: 'mini' - 'os-nosdn-osm-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'os-nosdn-osm' installer-type: 'osa' xci-flavor: 'mini' - 'os-odl-nofeature-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'os-odl-nofeature' installer-type: 'osa' xci-flavor: 'mini' - 'os-odl-bgpvpn-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'os-odl-bgpvpn' installer-type: 'osa' xci-flavor: 'mini' - 'os-odl-sfc-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'os-odl-sfc' installer-type: 'osa' xci-flavor: 'mini' - 'k8-nosdn-nofeature-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'k8-nosdn-nofeature' installer-type: 'kubespray' xci-flavor: 'mini' - 'k8-canal-nofeature-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'k8-canal-nofeature' installer-type: 'kubespray' xci-flavor: 'mini' - 'k8-calico-nofeature-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'k8-calico-nofeature' installer-type: 'kubespray' xci-flavor: 'mini' - 'k8-contiv-nofeature-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'k8-contiv-nofeature' installer-type: 'kubespray' xci-flavor: 'mini' - 'k8-flannel-nofeature-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'k8-flannel-nofeature' installer-type: 'kubespray' xci-flavor: 'mini' - 'k8-nosdn-istio-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'k8-nosdn-istio' installer-type: 'kubespray' xci-flavor: 'mini' @@ -99,6 +88,7 @@ phase: - 'deploy' - 'functest' + - 'yardstick' # ------------------------------- # jobs @@ -132,6 +122,9 @@ block-level: 'NODE' - logrotate-default + triggers: + - timed: '@midnight' + parameters: - string: name: DEPLOY_SCENARIO @@ -148,12 +141,15 @@ - string: name: XCI_DISTRO default: '{distro}' + - string: + name: FUNCTEST_VERSION + default: 'hunter' - string: name: FUNCTEST_MODE default: 'tier' - string: name: FUNCTEST_SUITE_NAME - default: 'healthcheck' + default: 'smoke' - string: name: CI_LOOP default: 'daily' @@ -162,9 +158,6 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - triggers: - - '{auto-trigger-name}' - wrappers: - ssh-agent-wrapper - build-timeout: @@ -183,6 +176,9 @@ XCI_FLAVOR=$XCI_FLAVOR CI_LOOP=$CI_LOOP XCI_DISTRO=$XCI_DISTRO + FUNCTEST_VERSION=$FUNCTEST_VERSION + FUNCTEST_MODE=$FUNCTEST_MODE + FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME same-node: true block: true - trigger-builds: @@ -194,6 +190,7 @@ XCI_FLAVOR=$XCI_FLAVOR CI_LOOP=$CI_LOOP XCI_DISTRO=$XCI_DISTRO + FUNCTEST_VERSION=$FUNCTEST_VERSION FUNCTEST_MODE=$FUNCTEST_MODE FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME same-node: true @@ -202,6 +199,21 @@ build-step-failure-threshold: 'never' failure-threshold: 'never' unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'xci-yardstick-{pod}-{distro}-daily-{stream}' + current-parameters: false + predefined-parameters: | + DEPLOY_SCENARIO=$DEPLOY_SCENARIO + INSTALLER_TYPE=$INSTALLER_TYPE + XCI_FLAVOR=$XCI_FLAVOR + CI_LOOP=$CI_LOOP + XCI_DISTRO=$XCI_DISTRO + same-node: true + block: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' publishers: # yamllint disable rule:line-length @@ -260,12 +272,15 @@ - label: name: SLAVE_LABEL default: '{slave-label}' + - string: + name: FUNCTEST_VERSION + default: 'hunter' - string: name: FUNCTEST_MODE default: 'tier' - string: name: FUNCTEST_SUITE_NAME - default: 'healthcheck' + default: 'smoke' - string: name: CI_LOOP default: 'daily' @@ -281,10 +296,10 @@ # -------------------------- # builder macros # -------------------------- -# These need to be properly fixed once the basic deployment and functest -# jobs are working outside of clean vm. -# One of the ugly fixes is moving functest preparation step into the -# deployment job itself since functest preparation requires some of the +# These need to be properly fixed once the basic deployment, functest, and +# yardstick jobs are working outside of clean vm. +# One of the ugly fixes is moving test preparation step into the +# deployment job itself since test preparation requires some of the # things from deployment job. With clean VM, this wasn't an issue # since everything was on clean VM. When we move things out of clean # VM, things are done in workspaces of the jobs that are different. @@ -306,12 +321,14 @@ echo "Removing $vm" sudo virsh destroy $vm > /dev/null 2>&1 || true sudo virsh undefine $vm > /dev/null 2>&1 || true + sudo killall -r vbmc > /dev/null 2>&1 || true + sudo rm -rf /root/.vbmc > /dev/null 2>&1 || true done echo "---------------------------------------------------------------------------------" cd $WORKSPACE/xci && ./xci-deploy.sh - echo "Prepare OPNFV VM for Functest" + echo "Prepare OPNFV VM for Tests" echo "---------------------------------------------------------------------------------" export XCI_PATH=$WORKSPACE export XCI_VENV=${XCI_PATH}/venv @@ -320,9 +337,10 @@ declare -x "\${var}" 2>/dev/null echo $var done < ${XCI_PATH}/.cache/xci.env && cd ${XCI_PATH}/xci && \ - ansible-playbook -i playbooks/dynamic_inventory.py playbooks/prepare-tests.yml - - echo "Run Functest" + ansible-playbook -i playbooks/dynamic_inventory.py \ + -i ${XCI_PATH}/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py \ + playbooks/prepare-tests.yml + ssh root@192.168.122.2 "/root/prepare-tests.sh" echo "---------------------------------------------------------------------------------" - builder: @@ -330,7 +348,35 @@ builders: - shell: | #!/bin/bash - set -o errexit set -o pipefail ssh root@192.168.122.2 "/root/run-functest.sh" + functest_exit=$? + + case ${DEPLOY_SCENARIO[0]} in + os-*) + FUNCTEST_LOG=/root/functest-results/functest.log + ;; + k8-*) + FUNCTEST_LOG=/root/functest-results/functest-kubernetes.log + ;; + *) + echo "Unable to determine the installer. Exiting!" + exit $functest_exit + ;; + esac + + echo "Functest log" + echo "---------------------------------------------------------------------------------" + ssh root@192.168.122.2 "cat $FUNCTEST_LOG" + echo "---------------------------------------------------------------------------------" + exit ${functest_exit} +- builder: + name: 'xci-daily-yardstick-macro' + builders: + - shell: | + #!/bin/bash + set -o errexit + set -o pipefail + + ssh root@192.168.122.2 "/root/run-yardstick.sh"