X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fxci-daily-jobs.yaml;h=649fa852135af87541b9217966290956229eca7c;hb=cbfd38030595c816628b1907738a1986d8ac21f4;hp=5f1e13433dd08d6a207d1d1c925d86a8d954dfef;hpb=6b631d71668db9d4bde2fb3ef517235e579faa45;p=releng.git diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml index 5f1e13433..649fa8521 100644 --- a/jjb/xci/xci-daily-jobs.yaml +++ b/jjb/xci/xci-daily-jobs.yaml @@ -17,21 +17,19 @@ # ------------------------------- scenario: - 'os-nosdn-nofeature-noha': - auto-trigger-name: 'daily-trigger-disabled' deploy-scenario: 'os-nosdn-nofeature' 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' + xci-flavor: 'noha' + - 'k8-calico-nofeature-noha': + deploy-scenario: 'k8-calico-nofeature' + installer-type: 'kubespray' + xci-flavor: 'noha' # ------------------------------- # XCI PODs # ------------------------------- pod: - - virtual: + - baremetal: <<: *master # ------------------------------- @@ -40,13 +38,13 @@ distro: - 'ubuntu': disabled: false - slave-label: xci-virtual + slave-label: xci-baremetal - 'centos': disabled: true - slave-label: xci-virtual + slave-label: xci-baremetal - 'opensuse': disabled: false - slave-label: xci-virtual + slave-label: xci-baremetal # ------------------------------- # Phases @@ -54,6 +52,7 @@ phase: - 'deploy' - 'functest' + - 'yardstick' # ------------------------------- # jobs @@ -77,14 +76,19 @@ use-build-blocker: true blocking-jobs: - '^xci-verify.*' + - '^xci-merge.*' - '^xci-os.*' + - '^xci-k8.*' - '^xci-deploy.*' - '^xci-functest.*' - '^bifrost-.*periodic.*' - '^osa-.*periodic.*' - block-level: 'NODE' + blocking-level: 'NODE' - logrotate-default + triggers: + - timed: '@midnight' + parameters: - string: name: DEPLOY_SCENARIO @@ -98,15 +102,20 @@ - label: name: SLAVE_LABEL default: '{slave-label}' - - label: + all-nodes: false + node-eligibility: 'ignore-offline' + - 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' @@ -115,10 +124,10 @@ 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: + timeout: 240 - fix-workspace-permissions builders: @@ -132,7 +141,10 @@ INSTALLER_TYPE=$INSTALLER_TYPE XCI_FLAVOR=$XCI_FLAVOR CI_LOOP=$CI_LOOP - XCI_DISTRO=$DISTRO + 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: @@ -143,7 +155,8 @@ INSTALLER_TYPE=$INSTALLER_TYPE XCI_FLAVOR=$XCI_FLAVOR CI_LOOP=$CI_LOOP - XCI_DISTRO=$DISTRO + XCI_DISTRO=$XCI_DISTRO + FUNCTEST_VERSION=$FUNCTEST_VERSION FUNCTEST_MODE=$FUNCTEST_MODE FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME same-node: true @@ -152,23 +165,26 @@ 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 # yamllint enable rule:line-length - email-jenkins-admins-on-failure - - postbuildscript: - builders: - - role: BOTH - build-on: - - ABORTED - - FAILURE - - NOT_BUILT - - SUCCESS - - UNSTABLE - build-steps: - - shell: !include-raw: ./xci-cleanup.sh - mark-unstable-if-failed: true - job-template: name: 'xci-{phase}-{pod}-{distro}-daily-{stream}' @@ -182,11 +198,12 @@ use-build-blocker: true blocking-jobs: - '^xci-verify.*' + - '^xci-merge.*' - '^xci-deploy.*' - '^xci-functest.*' - '^bifrost-.*periodic.*' - '^osa-.*periodic.*' - block-level: 'NODE' + blocking-level: 'NODE' - throttle: enabled: true max-per-node: 1 @@ -194,6 +211,9 @@ - logrotate-default wrappers: + - ssh-agent-wrapper + - build-timeout: + timeout: 240 - fix-workspace-permissions scm: @@ -211,19 +231,24 @@ default: 'osa' - string: name: XCI_FLAVOR - default: 'mini' - - label: + default: 'noha' + - string: name: XCI_DISTRO default: 'ubuntu' - label: name: SLAVE_LABEL default: '{slave-label}' + all-nodes: false + node-eligibility: 'ignore-offline' + - 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' @@ -239,6 +264,17 @@ # -------------------------- # builder macros # -------------------------- +# 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. +# +# Apart from these things, we will need to go through the scripts +# used for verify jobs and make them updated in order to be able to +# use them for jobs that don't use clean VM. - builder: name: 'xci-daily-deploy-macro' builders: @@ -247,17 +283,28 @@ set -o errexit set -o pipefail - cd $WORKSPACE/xci && ./xci-deploy.sh + echo "Cleaning the leftovers from the earlier run" + echo "---------------------------------------------------------------------------------" + for vm in $(sudo virsh list --all --name | grep -v xci_vm); do + 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 "---------------------------------------------------------------------------------" + + # select the right pdf/idf + pdf=$WORKSPACE/xci/var/${NODE_NAME}-pdf.yml + idf=$WORKSPACE/xci/var/${NODE_NAME}-idf.yml + if [[ "$NODE_NAME" =~ "virtual" ]]; then + pdf=$WORKSPACE/xci/var/pdf.yml + idf=$WORKSPACE/xci/var/idf.yml + fi -- builder: - name: 'xci-daily-functest-macro' - builders: - - shell: | - #!/bin/bash - set -o errexit - set -o pipefail + cd $WORKSPACE/xci && ./xci-deploy.sh -p $pdf -i $idf - echo "Prepare OPNFV VM for Functest" + echo "Prepare OPNFV VM for Tests" echo "---------------------------------------------------------------------------------" export XCI_PATH=$WORKSPACE export XCI_VENV=${XCI_PATH}/venv @@ -265,9 +312,45 @@ while read var; do 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-functest.yml - - echo "Run Functest" + done < ${XCI_PATH}/.cache/xci.env && cd ${XCI_PATH}/xci && \ + ansible-playbook -i playbooks/dynamic_inventory.py playbooks/prepare-tests.yml + ssh root@192.168.122.2 "/root/prepare-tests.sh" echo "---------------------------------------------------------------------------------" + +- builder: + name: 'xci-daily-functest-macro' + builders: + - shell: | + #!/bin/bash + 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"