diff options
| author |   David Blaisonneau <david.blaisonneau@orange.com> | 2016-01-06 18:02:49 +0100 |
|---|---|---|
| committer |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-01-08 12:41:03 +0000 |
| commit | 95bcdcbf6d2e2fb7aa3f0bdb8a1cd56d50db9731 (patch) | |
| tree | 757f1414d2b877afe7c8e86fff43c9c35b877ea3 /jjb/opnfv | |
| parent | f7d2f66f5a986cf25ccdb7f6bdf2cbd709202266 (diff) | |
Merge joid pod builders and add projet and pod default parameters
Change-Id: Ifeb2086eaaee7ecf95044bf9e6abf83b4b7bfae6
Signed-off-by: David Blaisonneau <david.blaisonneau@orange.com>
Diffstat (limited to 'jjb/opnfv')
| -rw-r--r-- | jjb/opnfv/installer-params.yml | 16 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 19 |
2 files changed, 31 insertions, 4 deletions
diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml index 3e5c0ffac..876cb1f2b 100644 --- a/jjb/opnfv/installer-params.yml +++ b/jjb/opnfv/installer-params.yml @@ -101,3 +101,19 @@ name: EXTERNAL_NETWORK default: 'net04_ext' description: 'external network for test' + - string: + name: CEPH_DISKS + default: '/srv' + description: "Disks to use by ceph by default (space separated list)" + - string: + name: LAB_CONFIG + default: "$HOME/joid_config" + description: "Local lab config and Openstack openrc location" + - string: + name: CEPH_REFORMAT + default: 'false' + description: "Format or not disk before using ceph [true/false] (must be done the first time)" + - string: + name: MAAS_REINSTALL + default: 'false' + description: "Reinstall MAAS and Bootstrap before deploy [true/false]" diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index cb9d08fed..387038245 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -146,6 +146,10 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' + - string: + name: CEPH_DISKS + default: /srv + description: "Disks to use by ceph (comma separated list)" - parameter: name: 'intel-pod6-defaults' @@ -165,6 +169,10 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' + - string: + name: CEPH_DISKS + default: /srv + description: "Disks to use by ceph (comma separated list)" - parameter: name: 'intel-pod8-defaults' @@ -304,10 +312,13 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - string: - name: LAB_CONFIG - default: "/home/opnfv/repos/functest" - description: "Openstack credentials on the dev lab" - + name: CEPH_DISKS + default: /dev/sdb /dev/sdc + description: "Disks to use by ceph by default (space separated list)" + - string: + name: CEPH_DISKS_CONTROLLERS + default: /dev/sdb + description: "Disks to use by ceph on controler nodes (space separated list)" - parameter: name: 'orange-test1-defaults' |