X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2F3rd_party_ci%2Fodl-netvirt.yml;h=054761ea78a8d79767095c64041a54189df13541;hb=920091e23e0beea236ffc658db9d9ecb8a9891b9;hp=46bdd25ad519d780da79f2647f53ccaf0b91748c;hpb=9911d9b69b179876f8179bfeae22147542ebb3fc;p=releng.git diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml index 46bdd25ad..054761ea7 100644 --- a/jjb/3rd_party_ci/odl-netvirt.yml +++ b/jjb/3rd_party_ci/odl-netvirt.yml @@ -20,8 +20,6 @@ slave-label: 'ericsson-virtual5' - 'install-netvirt': slave-label: 'odl-netvirt-virtual' - - 'functest': - slave-label: 'odl-netvirt-virtual' - 'postprocess': slave-label: 'odl-netvirt-virtual' ##################################### @@ -119,10 +117,10 @@ name: functest condition: SUCCESSFUL projects: - - name: 'functest-netvirt-virtual-suite-{stream}' + - name: 'functest-netvirt-virtual-daily-{stream}' predefined-parameters: | - FUNCTEST_SUITE_NAME=vping_userdata,bgpvpn RC_FILE_PATH=/home/jenkins/cloner-info/overcloudrc + DEPLOY_SCENARIO=os-odl_l2-bgpvpn-noha node-parameters: true kill-phase-on: FAILURE abort-all-job: false @@ -161,7 +159,7 @@ use-build-blocker: true blocking-jobs: - 'odl-netvirt-verify-virtual-install-.*' - - 'odl-netvirt-verify-virtual-functest-.*' + - 'functest-netvirt-virtual-daily-.*' - 'odl-netvirt-verify-virtual-postprocess-.*' block-level: 'NODE' @@ -198,11 +196,6 @@ !include-raw: ./download-netvirt-artifact.sh - shell: !include-raw: ./install-netvirt.sh -- builder: - name: 'netvirt-verify-functest-builder' - builders: - - shell: - !include-raw: ./functest-netvirt.sh - builder: name: 'netvirt-verify-postprocess-builder' builders: