diff options
Diffstat (limited to 'jjb/apex')
| -rw-r--r-- | jjb/apex/apex.yml | 25 | ||||
| -rw-r--r-- | jjb/apex/apex.yml.j2 | 3 | ||||
| -rw-r--r-- | jjb/apex/scenarios.yaml.hidden | 2 |
3 files changed, 26 insertions, 4 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 26eddb5b2..07181fcad 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -132,6 +132,10 @@ <<: *master - 'os-odl-sfc-ha': <<: *master + - 'os-odl-fdio-dvr-noha': + <<: *master + - 'os-odl-fdio-dvr-ha': + <<: *master platform: - 'baremetal' @@ -669,7 +673,7 @@ description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO" - multijob: name: 'Baremetal Deploy' - condition: ALWAYS + condition: SUCCESSFUL projects: - name: 'apex-deploy-baremetal-{scenario_stream}' node-parameters: true @@ -684,7 +688,6 @@ git-revision: false - multijob: name: 'OPNFV Test Suite' - condition: SUCCESSFUL projects: - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' node-parameters: true @@ -1332,6 +1335,24 @@ abort-all-job: true git-revision: false + - name: 'apex-os-odl-fdio-dvr-noha-baremetal-master' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + + - name: 'apex-os-odl-fdio-dvr-ha-baremetal-master' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + # snapshot create diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index 5d7f150cd..2d760f854 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -585,7 +585,7 @@ description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO" - multijob: name: 'Baremetal Deploy' - condition: ALWAYS + condition: SUCCESSFUL projects: - name: 'apex-deploy-baremetal-{scenario_stream}' node-parameters: true @@ -600,7 +600,6 @@ git-revision: false - multijob: name: 'OPNFV Test Suite' - condition: SUCCESSFUL projects: - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' node-parameters: true diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden index f49fa83c7..def4e796a 100644 --- a/jjb/apex/scenarios.yaml.hidden +++ b/jjb/apex/scenarios.yaml.hidden @@ -18,6 +18,8 @@ master: - 'os-nosdn-kvm_ovs_dpdk-ha' - 'os-odl-sfc-noha' - 'os-odl-sfc-ha' + - 'os-odl-fdio-dvr-noha' + - 'os-odl-fdio-dvr-ha' danube: - 'os-nosdn-nofeature-noha' - 'os-nosdn-nofeature-ha' |