summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/apex/opnfv-apex.yml10
-rw-r--r--jjb/compass4nfv/opnfv-compass4nfv.yml10
-rw-r--r--jjb/fuel/opnfv-fuel.yml10
-rw-r--r--jjb/joid/joid.yml12
-rw-r--r--jjb/opnfv/pod-params.yml74
5 files changed, 77 insertions, 39 deletions
diff --git a/jjb/apex/opnfv-apex.yml b/jjb/apex/opnfv-apex.yml
index cb605fb4e..de2947cec 100644
--- a/jjb/apex/opnfv-apex.yml
+++ b/jjb/apex/opnfv-apex.yml
@@ -12,7 +12,7 @@
- 'onos'
- 'opencontrail'
- pod: 'intel-pod2'
+ pod: 'intelpod2-jumphost'
stream:
- master:
@@ -20,14 +20,14 @@
gs-pathname: ''
jobs:
- - 'opnfv-apex-{controller}-daily-{stream}'
- - 'opnfv-apex-daily-deploy-{stream}'
+ - 'opnfv-apex-{controller}-{pod}-daily-{stream}'
+ - 'opnfv-apex-deploy-{pod}-daily-{stream}'
########################
# job templates
########################
- job-template:
- name: 'opnfv-apex-{controller}-daily-{stream}'
+ name: 'opnfv-apex-{controller}-{pod}-daily-{stream}'
disabled: true
@@ -55,7 +55,7 @@
CONTROLLER={controller}
- job-template:
- name: 'opnfv-apex-daily-deploy-{stream}'
+ name: 'opnfv-apex-deploy-{pod}-daily-{stream}'
disabled: true
diff --git a/jjb/compass4nfv/opnfv-compass4nfv.yml b/jjb/compass4nfv/opnfv-compass4nfv.yml
index b9dd53f04..bebcf1f99 100644
--- a/jjb/compass4nfv/opnfv-compass4nfv.yml
+++ b/jjb/compass4nfv/opnfv-compass4nfv.yml
@@ -12,7 +12,7 @@
- 'onos'
- 'opencontrail'
- pod: 'huawei-pod1'
+ pod: 'huawei-us-deploy-bare-1'
stream:
- master:
@@ -20,14 +20,14 @@
gs-pathname: ''
jobs:
- - 'opnfv-compass4nfv-{controller}-daily-{stream}'
- - 'opnfv-compass4nfv-daily-deploy-{stream}'
+ - 'opnfv-compass4nfv-{controller}-{pod}-daily-{stream}'
+ - 'opnfv-compass4nfv-deploy-{pod}-daily-{stream}'
########################
# job templates
########################
- job-template:
- name: 'opnfv-compass4nfv-{controller}-daily-{stream}'
+ name: 'opnfv-compass4nfv-{controller}-{pod}-daily-{stream}'
disabled: true
@@ -55,7 +55,7 @@
CONTROLLER={controller}
- job-template:
- name: 'opnfv-compass4nfv-daily-deploy-{stream}'
+ name: 'opnfv-compass4nfv-deploy-{pod}-daily-{stream}'
disabled: true
diff --git a/jjb/fuel/opnfv-fuel.yml b/jjb/fuel/opnfv-fuel.yml
index 1e39bf686..4070f46cf 100644
--- a/jjb/fuel/opnfv-fuel.yml
+++ b/jjb/fuel/opnfv-fuel.yml
@@ -12,7 +12,7 @@
- 'onos'
- 'opencontrail'
- pod: 'lf-pod2'
+ pod: 'opnfv-jump-2'
stream:
- master:
@@ -20,14 +20,14 @@
gs-pathname: ''
jobs:
- - 'opnfv-fuel-{controller}-daily-{stream}'
- - 'opnfv-fuel-daily-deploy-{stream}'
+ - 'opnfv-fuel-{controller}-{pod}-daily-{stream}'
+ - 'opnfv-fuel-deploy-{pod}-daily-{stream}'
########################
# job templates
########################
- job-template:
- name: 'opnfv-fuel-{controller}-daily-{stream}'
+ name: 'opnfv-fuel-{controller}-{pod}-daily-{stream}'
disabled: true
@@ -56,7 +56,7 @@
CONTROLLER={controller}
- job-template:
- name: 'opnfv-fuel-daily-deploy-{stream}'
+ name: 'opnfv-fuel-deploy-{pod}-daily-{stream}'
disabled: true
diff --git a/jjb/joid/joid.yml b/jjb/joid/joid.yml
index d47709e19..90cbfbe8f 100644
--- a/jjb/joid/joid.yml
+++ b/jjb/joid/joid.yml
@@ -9,7 +9,7 @@
controller: 'odl'
- pod: 'intel-pod5'
+ pod: 'intel-us-deploy-bare-pod5'
stream:
- master:
@@ -17,14 +17,14 @@
gs-pathname: ''
jobs:
- - 'joid-{controller}-daily-{stream}-{pod}'
- - 'joid-daily-deploy-{stream}'
+ - 'joid-{controller}-{pod}-daily-{stream}'
+ - 'joid-deploy-{pod}-daily-{stream}'
########################
# job templates
########################
- job-template:
- name: 'joid-{controller}-daily-{stream}-{pod}'
+ name: 'joid-{controller}-{pod}-daily-{stream}'
disabled: false
@@ -33,7 +33,7 @@
parameters:
- project-parameter:
project: '{installer}'
- - 'opnfv-build-defaults'
+ - 'intel-us-build-1-defaults'
- '{installer}-defaults':
controller: '{controller}'
@@ -52,7 +52,7 @@
CONTROLLER={controller}
- job-template:
- name: 'joid-daily-deploy-{stream}'
+ name: 'joid-deploy-{pod}-daily-{stream}'
disabled: false
diff --git a/jjb/opnfv/pod-params.yml b/jjb/opnfv/pod-params.yml
index 275311ab6..654f9e1cc 100644
--- a/jjb/opnfv/pod-params.yml
+++ b/jjb/opnfv/pod-params.yml
@@ -1,5 +1,5 @@
- parameter:
- name: 'lf-pod1-defaults'
+ name: 'opnfv-jump-1-defaults'
parameters:
- node:
name: SLAVE_NAME
@@ -22,7 +22,7 @@
description: 'SSH key to use for Apex'
- parameter:
- name: 'lf-pod2-defaults'
+ name: 'opnfv-jump-2-defaults'
parameters:
- node:
name: SLAVE_NAME
@@ -38,11 +38,18 @@
- string:
name: GIT_BASE
default: ssh://gerrit.opnfv.org:29418/$PROJECT
- description: 'Git URL for LF POD2'
description: 'Git URL to use on the jumphost'
+ - string:
+ name: YARDSTICK_TEST_SUITE
+ default: opnfv_${{NODE_NAME}}_{loop}.yaml
+ description: 'Path to test suite'
+ - string:
+ name: YARDSTICK_DB_BACKEND
+ default: 'db_args'
+ description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'ericsson-pod1-defaults'
+ name: 'ericsson-ca-deploy-bare-pod1-defaults'
parameters:
- node:
name: SLAVE_NAME
@@ -59,10 +66,13 @@
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on the jumphost'
-
+ - string:
+ name: YARDSTICK_TEST_SUITE
+ default: opnfv_${{NODE_NAME}}_{loop}.yaml
+ description: 'Path to test suite'
- parameter:
- name: 'ericsson-pod2-defaults'
+ name: 'ericsson-ca-deploy-bare-pod2-defaults'
parameters:
- node:
name: SLAVE_NAME
@@ -81,7 +91,7 @@
description: 'Git URL to use on the jumphost'
- parameter:
- name: 'intel-pod2-defaults'
+ name: 'intelpod2-jumphost-defaults'
parameters:
- node:
name: SLAVE_NAME
@@ -104,7 +114,7 @@
description: 'SSH key to use for Apex'
- parameter:
- name: 'intel-pod5-defaults'
+ name: 'intel-us-deploy-bare-pod5-defaults'
parameters:
- node:
name: SLAVE_NAME
@@ -123,15 +133,15 @@
description: 'Git URL to use on the jumphost'
- parameter:
- name: 'intel-pod6-defaults'
+ name: 'intel-us-deploy-bare-pod6-defaults'
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - intelpod6-jumphost
+ - intel-us-deploy-bare-pod6
default-slaves:
- - intelpod6-jumphost
+ - intel-us-deploy-bare-pod6
- string:
name: INSTALLER_VERSION
default: latest
@@ -142,15 +152,15 @@
description: 'Git URL to use on the jumphost'
- parameter:
- name: 'intel-pod8-defaults'
+ name: 'intel-us-deploy-bare-pod8-defaults'
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - intelpod8-jumphost
+ - intel-us-deploy-bare-pod8
default-slaves:
- - intelpod8-jumphost
+ - intel-us-deploy-bare-pod8
- string:
name: INSTALLER_VERSION
default: latest
@@ -161,7 +171,7 @@
description: 'Git URL to use on the jumphost'
- parameter:
- name: 'huawei-pod1-defaults'
+ name: 'huawei-us-deploy-bare-1-defaults'
parameters:
- node:
name: SLAVE_NAME
@@ -180,18 +190,46 @@
description: 'Git URL to use on the jumphost'
- parameter:
- name: 'opnfv-build-defaults'
+ name: 'intel-us-build-1-defaults'
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- intel-us-build-1
- - ericsson-ca-build-1
default-slaves:
- intel-us-build-1
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on the slave'
+
+- parameter:
+ name: 'intel-us-build-2-defaults'
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - intel-us-build-2
+ default-slaves:
+ - intel-us-build-2
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on the slave'
+
+- parameter:
+ name: 'ericsson-ca-build-1-defaults'
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - ericsson-ca-build-1
+ default-slaves:
- ericsson-ca-build-1
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: 'Git URL to use on the jumphost'
+ description: 'Git URL to use on the slave'