diff options
Diffstat (limited to 'jjb/xci/xci-daily-jobs.yaml')
| -rw-r--r-- | jjb/xci/xci-daily-jobs.yaml | 54 |
1 files changed, 37 insertions, 17 deletions
diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml index a67ff059c..fcd4465cb 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' @@ -133,6 +122,9 @@ block-level: 'NODE' - logrotate-default + triggers: + - timed: '@midnight' + parameters: - string: name: DEPLOY_SCENARIO @@ -150,11 +142,14 @@ 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' @@ -163,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: @@ -184,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: @@ -195,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 @@ -277,11 +273,14 @@ 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' @@ -322,6 +321,8 @@ 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 "---------------------------------------------------------------------------------" @@ -345,10 +346,29 @@ 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: |