summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvitikkan <viktor.tikkanen@nokia.com>2016-04-07 14:26:03 +0300
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-04-08 21:34:02 +0000
commit81c7a55635d6b64c403a948869064b1d70238ade (patch)
tree05e0c8be9c3e3f4f5645dfcbb0ee6054651402bb
parent1bb2dbc9d552611c00f072e1369a2c02dc9a5676 (diff)
Added nokia-pod1 slave defaults
Also created Functest job for master to run against nokia-pod1. Change-Id: Idae45a586636e1884c56a9df46b1ec18c9fea827 Signed-off-by: vitikkan <viktor.tikkanen@nokia.com>
-rw-r--r--jjb/functest/functest-ci-jobs.yml3
-rw-r--r--jjb/opnfv/slave-params.yml23
2 files changed, 26 insertions, 0 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index a117dc814..57f48109b 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -91,6 +91,9 @@
- huawei-us-deploy-bare-2:
installer: compass
<<: *master
+ - nokia-pod1:
+ installer: apex
+ <<: *master
#--------------------------------
testsuite:
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index fb9d66450..8ee4b0be6 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -536,3 +536,26 @@
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
+
+- parameter:
+ name: 'nokia-pod1-defaults'
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - nokia-pod1
+ default-slaves:
+ - nokia-pod1
+ - string:
+ name: INSTALLER_VERSION
+ default: stable
+ description: 'Version of the installer to deploy'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+ - string:
+ name: SSH_KEY
+ default: /root/.ssh/id_rsa
+ description: 'SSH key to use for Apex'