summaryrefslogtreecommitdiffstats
path: root/jjb/opnfv
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/opnfv')
-rw-r--r--jjb/opnfv/installer-params.yml10
-rw-r--r--jjb/opnfv/opnfv-docs.yml2
-rw-r--r--jjb/opnfv/slave-params.yml10
3 files changed, 16 insertions, 6 deletions
diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index ec0b86170..55f4769b7 100644
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -59,7 +59,7 @@
parameters:
- string:
name: INSTALLER_IP
- default: '192.168.Y.Y'
+ default: '192.168.122.5'
description: 'IP of the installer'
- string:
name: INSTALLER_TYPE
@@ -67,11 +67,11 @@
description: 'Installer used for deploying OPNFV on this POD'
- string:
name: OS_RELEASE
- default: 'mitaka'
- description: 'OpenStack release (liberty|mitaka)'
+ default: 'newton'
+ description: 'OpenStack release (mitaka|newton)'
- string:
name: EXTERNAL_NETWORK
- default: ext-net4
+ default: ext-net
description: "External network used for Floating ips."
- string:
name: LAB_CONFIG
@@ -84,7 +84,7 @@
- string:
name: UBUNTU_DISTRO
default: 'xenial'
- description: "Ubuntu distribution to use for Openstack (trusty|xenial)"
+ description: "Ubuntu distribution to use for Openstack (xenial)"
- string:
name: CPU_ARCHITECTURE
default: 'amd64'
diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml
index 307c1db44..442e8ea71 100644
--- a/jjb/opnfv/opnfv-docs.yml
+++ b/jjb/opnfv/opnfv-docs.yml
@@ -19,7 +19,7 @@
disabled: false
- colorado:
branch: 'stable/{stream}'
- doc-version: '2.0'
+ doc-version: '3.0'
gs-pathname: '/{stream}/{doc-version}'
disabled: false
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index b46960fa7..dd0c97996 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -660,6 +660,16 @@
name: SSH_KEY
default: /root/.ssh/id_rsa
description: 'SSH key to be used'
+- parameter:
+ name: 'multisite-virtual-defaults'
+ parameters:
+ - label:
+ name: SLAVE_LABEL
+ default: 'multisite-virtual'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
#####################################################
# These slaves are just dummy slaves for sandbox jobs
#####################################################