summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/fuel/fuel-ci-jobs.yml36
-rw-r--r--jjb/opnfv/installer-params.yml4
-rw-r--r--jjb/opnfv/slave-params.yml8
3 files changed, 25 insertions, 23 deletions
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index 9caf3d183..e99981454 100644
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -41,21 +41,31 @@
# new scenario descriptions
scenario:
- - 'os-nosdn-kvm-ha':
+ - 'os-odl_l2-nofeature-ha':
+ auto-trigger-name: 'fuel-{scenario}-{pod}-trigger'
+ - 'os-odl_l3-nofeature-ha':
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- - 'os-nosdn-kvm_ovs-ha':
+ - 'os-onos-nofeature-ha':
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- 'os-nosdn-nofeature-ha':
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ - 'os-nosdn-kvm-ha':
+ auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ - 'os-nosdn-kvm_ovs-ha':
+ auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- 'os-nosdn-ovs-ha':
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- 'os-nosdn-vlan-ha':
auto-trigger-name: 'fuel-{scenario}-{pod}-trigger'
- - 'os-odl_l2-nofeature-ha':
- auto-trigger-name: 'fuel-{scenario}-{pod}-trigger'
- - 'os-odl_l3-nofeature-ha':
+ - 'os-odl_l2-nofeature-noha':
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- - 'os-onos-nofeature-ha':
+ - 'os-odl_l3-nofeature-noha':
+ auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ - 'os-onos-nofeature-noha':
+ auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ - 'os-nosdn-nofeature-noha':
+ auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ - 'os-odl_l2-bgpvpn-noha':
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
jobs:
@@ -63,13 +73,15 @@
- 'fuel-deploy-{pod}-daily-{stream}'
########################
-# job templates - old type of defining the scenario
+# job templates
########################
- job-template:
name: 'fuel-{scenario}-{pod}-daily-{stream}'
project-type: multijob
+ node: intel-build
+
concurrent: false
properties:
@@ -92,7 +104,6 @@
parameters:
- project-parameter:
project: '{project}'
- - '{pod}-defaults'
- '{installer}-defaults'
- string:
name: DEPLOY_SCENARIO
@@ -106,21 +117,24 @@
condition: SUCCESSFUL
projects:
- name: 'fuel-deploy-{pod}-daily-{stream}'
- current-parameters: true
+ current-parameters: false
+ predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
kill-phase-on: FAILURE
- multijob:
name: functest
condition: COMPLETED
projects:
- name: 'functest-fuel-{pod}-daily-{stream}'
- current-parameters: true
+ current-parameters: false
+ predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
kill-phase-on: NEVER
- multijob:
name: yardstick
condition: COMPLETED
projects:
- name: 'yardstick-fuel-{pod}-daily-{stream}'
- current-parameters: true
+ current-parameters: false
+ predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
kill-phase-on: NEVER
- job-template:
diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index ff7a239cb..986ecc081 100644
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -46,10 +46,6 @@
default: fuel
description: 'Installer used for deploying OPNFV on this POD'
- string:
- name: DEPLOY_SCENARIO
- default: 'none'
- description: 'Scenario to deploy and test'
- - string:
name: EXTERNAL_NETWORK
default: 'net04_ext'
description: 'external network for test'
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index f173bd928..c6078c613 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -39,10 +39,6 @@
name: GIT_BASE
default: ssh://gerrit.opnfv.org:29418/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
- - string:
- name: POD_CONF_DIR
- default: $WORKSPACE/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2
- description: 'Directory where POD configuration files are located.'
- parameter:
name: 'ericsson-pod1-defaults'
@@ -85,10 +81,6 @@
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
- - string:
- name: POD_CONF_DIR
- default: $WORKSPACE/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/pod2
- description: 'Directory where POD configuration files are located.'
- parameter:
name: 'intelpod2-jumphost-defaults'