summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-12-10 17:00:17 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-12-10 17:00:17 +0000
commit99c121c4a1b8602e21643d38d4aa28cf4ee4c83a (patch)
treeea21818621eff747cdd1ed88d11a1cf30b65f7d9
parent7a1c0226296b4c128590ce8d8d86b0e1d4d8be97 (diff)
parent7defa8341a6b60067e3208d0e62da7a4b048a69f (diff)
Merge "Shorten and remove the word deploy from pod names"
-rw-r--r--jjb/fuel/opnfv-fuel.yml21
-rw-r--r--jjb/functest/functest.yml8
-rw-r--r--jjb/joid/joid.yml2
-rw-r--r--jjb/opnfv/pod-params.yml30
4 files changed, 33 insertions, 28 deletions
diff --git a/jjb/fuel/opnfv-fuel.yml b/jjb/fuel/opnfv-fuel.yml
index 4070f46cf..aec85bc9c 100644
--- a/jjb/fuel/opnfv-fuel.yml
+++ b/jjb/fuel/opnfv-fuel.yml
@@ -12,7 +12,12 @@
- 'onos'
- 'opencontrail'
- pod: 'opnfv-jump-2'
+ pod:
+ - 'opnfv-jump-2'
+ - 'ericsson-pod1'
+
+ loop:
+ - 'daily'
stream:
- master:
@@ -20,24 +25,23 @@
gs-pathname: ''
jobs:
- - 'opnfv-fuel-{controller}-{pod}-daily-{stream}'
- - 'opnfv-fuel-deploy-{pod}-daily-{stream}'
+ - 'opnfv-fuel-{controller}-{pod}-{loop}-{stream}'
+ - 'opnfv-fuel-deploy-{pod}-{loop}-{stream}'
########################
# job templates
########################
- job-template:
- name: 'opnfv-fuel-{controller}-{pod}-daily-{stream}'
+ name: 'opnfv-fuel-{controller}-{pod}-{loop}-{stream}'
disabled: true
concurrent: false
- node: ericsson-build
-
parameters:
- project-parameter:
project: '{installer}'
+ - 'ericsson-ca-build-1-defaults'
- '{installer}-defaults':
controller: '{controller}'
@@ -56,7 +60,7 @@
CONTROLLER={controller}
- job-template:
- name: 'opnfv-fuel-deploy-{pod}-daily-{stream}'
+ name: 'opnfv-fuel-deploy-{pod}-{loop}-{stream}'
disabled: true
@@ -69,7 +73,8 @@
parameters:
- project-parameter:
project: '{installer}'
- - '{pod}-defaults'
+ - '{pod}-defaults':
+ loop: '{loop}'
- '{installer}-defaults'
scm:
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 9e5e71b16..b8de928c2 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -22,7 +22,7 @@
installer_type: 'compass'
installer_ip: '192.168.200.2'
- joid:
- node: 'intel-us-deploy-bare-pod5'
+ node: 'intel-pod5'
installer_type: 'compass'
installer_ip: '127.0.0.1'
pod:
@@ -38,8 +38,8 @@
node: 'huawei-us-deploy-bare-1'
installer_type: 'compass'
installer_ip: '192.168.200.2'
- - intel-us-deploy-bare-pod5:
- node: 'intel-us-deploy-bare-pod5'
+ - intel-pod5:
+ node: 'intel-pod5'
installer_type: 'joid'
installer_ip: '127.0.0.1'
@@ -396,7 +396,7 @@
description: "Override GIT_BASE"
- parameter:
- name: intel-us-deploy-bare-pod5
+ name: intel-pod5
parameters:
- string:
name: GIT_BASE
diff --git a/jjb/joid/joid.yml b/jjb/joid/joid.yml
index 90cbfbe8f..e187c881c 100644
--- a/jjb/joid/joid.yml
+++ b/jjb/joid/joid.yml
@@ -9,7 +9,7 @@
controller: 'odl'
- pod: 'intel-us-deploy-bare-pod5'
+ pod: 'intel-pod5'
stream:
- master:
diff --git a/jjb/opnfv/pod-params.yml b/jjb/opnfv/pod-params.yml
index 654f9e1cc..fc6650ffb 100644
--- a/jjb/opnfv/pod-params.yml
+++ b/jjb/opnfv/pod-params.yml
@@ -49,15 +49,15 @@
description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'ericsson-ca-deploy-bare-pod1-defaults'
+ name: 'ericsson-pod1-defaults'
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - ericsson-ca-deploy-bare-pod1
+ - ericsson-pod1
default-slaves:
- - ericsson-ca-deploy-bare-pod1
+ - ericsson-pod1
- string:
name: INSTALLER_VERSION
default: latest
@@ -72,15 +72,15 @@
description: 'Path to test suite'
- parameter:
- name: 'ericsson-ca-deploy-bare-pod2-defaults'
+ name: 'ericsson-pod2-defaults'
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - ericsson-ca-deploy-bare-pod2
+ - ericsson-pod2
default-slaves:
- - ericsson-ca-deploy-bare-pod2
+ - ericsson-pod2
- string:
name: INSTALLER_VERSION
default: latest
@@ -114,15 +114,15 @@
description: 'SSH key to use for Apex'
- parameter:
- name: 'intel-us-deploy-bare-pod5-defaults'
+ name: 'intel-pod5-defaults'
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - intel-us-deploy-bare-pod5
+ - intel-pod5
default-slaves:
- - intel-us-deploy-bare-pod5
+ - intel-pod5
- string:
name: INSTALLER_VERSION
default: stable
@@ -133,15 +133,15 @@
description: 'Git URL to use on the jumphost'
- parameter:
- name: 'intel-us-deploy-bare-pod6-defaults'
+ name: 'intel-pod6-defaults'
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - intel-us-deploy-bare-pod6
+ - intel-pod6
default-slaves:
- - intel-us-deploy-bare-pod6
+ - intel-pod6
- string:
name: INSTALLER_VERSION
default: latest
@@ -152,15 +152,15 @@
description: 'Git URL to use on the jumphost'
- parameter:
- name: 'intel-us-deploy-bare-pod8-defaults'
+ name: 'intel-pod8-defaults'
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - intel-us-deploy-bare-pod8
+ - intel-pod8
default-slaves:
- - intel-us-deploy-bare-pod8
+ - intel-pod8
- string:
name: INSTALLER_VERSION
default: latest