summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-08-02 11:07:36 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-02 11:07:36 +0000
commit3159b78bf555fc30bcc3bf0bb7445e6ec22ff137 (patch)
tree1d7e55a7c9caa36bfec89b71c0fb4ee98ff1fdfc /jjb
parent4c60443cbba7eb3b72311c6b5e93de661d28994c (diff)
parent350d7c1a196d2a2ad44afbe6a9e2571ec46dc8ed (diff)
Merge "qtip: Create job for zte-pod2 and override fuel IP"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/opnfv/slave-params.yml18
-rw-r--r--jjb/qtip/qtip-ci-jobs.yml6
2 files changed, 23 insertions, 1 deletions
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index a75fe11a5..b5cf4cd9d 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -337,6 +337,24 @@
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
- parameter:
+ name: 'zte-pod2-defaults'
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - zte-pod2
+ default-slaves:
+ - zte-pod2
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+ - string:
+ name: INSTALLER_IP
+ default: '10.20.1.2'
+ description: 'IP of the installer'
+- parameter:
name: 'juniper-pod1-defaults'
parameters:
- node:
diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml
index 068b273f7..ef455f8df 100644
--- a/jjb/qtip/qtip-ci-jobs.yml
+++ b/jjb/qtip/qtip-ci-jobs.yml
@@ -42,6 +42,10 @@
installer: fuel
auto-trigger-name: 'qtip-daily-zte-pod1-trigger'
<<: *master
+ - zte-pod2:
+ installer: fuel
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *master
#--------------------------------
jobs:
@@ -58,8 +62,8 @@
parameters:
- project-parameter:
project: '{project}'
- - '{pod}-defaults'
- '{installer}-defaults'
+ - '{pod}-defaults'
- string:
name: DEPLOY_SCENARIO
default: 'os-nosdn-nofeature-ha'