summaryrefslogtreecommitdiffstats
path: root/jjb/opnfv
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/opnfv')
-rw-r--r--jjb/opnfv/installer-params.yml16
-rw-r--r--jjb/opnfv/slave-params.yml6
2 files changed, 18 insertions, 4 deletions
diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index dc170f79a..8a189ece8 100644
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -17,6 +17,10 @@
name: OPNFV_FEATURE
default: 'none'
description: 'OPNFV Feature to activate'
+ - string:
+ name: EXTERNAL_NETWORK
+ default: 'net04_ext'
+ description: 'external network for test'
- parameter:
name: 'compass-defaults'
@@ -37,6 +41,10 @@
name: OPNFV_FEATURE
default: 'none'
description: 'OPNFV Feature to activate'
+ - string:
+ name: EXTERNAL_NETWORK
+ default: 'ext-net'
+ description: 'external network for test'
- parameter:
name: 'fuel-defaults'
@@ -61,6 +69,10 @@
name: DEPLOY_SCENARIO
default: 'test'
description: 'OPNFV Deployment Scenario'
+ - string:
+ name: EXTERNAL_NETWORK
+ default: 'net04_ext'
+ description: 'external network for test'
- parameter:
name: 'joid-defaults'
@@ -89,3 +101,7 @@
name: OS_RELEASE
default: 'liberty'
description: 'OpenStack release (kilo|liberty)'
+ - 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 576f605d8..43edcc2ca 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -336,12 +336,10 @@
description: 'Slave name on Jenkins'
allowed-slaves:
- intel-us-deploy-virtual-1
-# ericsson slave has been excluded until the issues are identified and solved
-# - ericsson-ca-deploy-virtual-1
+ - ericsson-ca-deploy-virtual-1
default-slaves:
- intel-us-deploy-virtual-1
-# ericsson slave has been excluded until the issues are identified and solved
-# - ericsson-ca-deploy-virtual-1
+ - ericsson-ca-deploy-virtual-1
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT