summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Juvonen <tomi.juvonen@nokia.com>2018-12-21 12:08:01 +0200
committerTomi Juvonen <tomi.juvonen@nokia.com>2018-12-21 12:10:38 +0200
commitcc290b2f937a2edbd60a5d2d1e20f333dfc7eb88 (patch)
tree348b7f3e1f024d564b980cba63eab50d0eff113e
parentc94c4f4bf1d220be7cf910b346d72114a05dfc72 (diff)
Doctor to run Fenix as admin tool
First run all with sample Inspector Second maitenance with Fenix Third fault_management with Congress inspector Change-Id: Id2eb505fc167d06531eebf022840173617a02ec3 Signed-off-by: Tomi Juvonen <tomi.juvonen@nokia.com>
-rw-r--r--jjb/doctor/doctor.yaml22
1 files changed, 21 insertions, 1 deletions
diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index 71c519856..5f0e677c8 100644
--- a/jjb/doctor/doctor.yaml
+++ b/jjb/doctor/doctor.yaml
@@ -90,6 +90,19 @@
kill-phase-on: FAILURE
git-revision: true
- multijob:
+ name: 'doctor-verify-fenix'
+ execution-type: PARALLEL
+ projects:
+ - name: 'doctor-verify-maintenance-apex-sample-x86_64-{stream}'
+ predefined-parameters: |
+ PROJECT=$PROJECT
+ GERRIT_BRANCH=$GERRIT_BRANCH
+ GERRIT_REFSPEC=$GERRIT_REFSPEC
+ GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+ kill-phase-on: FAILURE
+ git-revision: true
+ - multijob:
name: 'doctor-verify-congress'
execution-type: PARALLEL
projects:
@@ -121,6 +134,7 @@
inspector: '{inspector}'
scenario: '{scenario}'
test_case: 'fault_management'
+ admin_tool_type: 'sample'
scm:
- git-scm-gerrit
builders:
@@ -131,7 +145,7 @@
- job-template:
name: 'doctor-verify-maintenance-{installer}-{inspector}-{arch}-{stream}'
disabled: '{obj:disabled}'
- node: 'nokia-pod1'
+ node: 'doctor-{installer}-{arch}'
wrappers:
- ssh-agent-wrapper
- build-timeout:
@@ -146,6 +160,7 @@
inspector: '{inspector}'
scenario: '{scenario}'
test_case: 'maintenance'
+ admin_tool_type: 'fenix'
scm:
- git-scm-gerrit
builders:
@@ -171,6 +186,7 @@
inspector: '{inspector}'
scenario: '{scenario}'
test_case: 'all'
+ admin_tool_type: 'sample'
scm:
- git-scm-gerrit
builders:
@@ -197,6 +213,10 @@
name: DEPLOY_SCENARIO
default: '{scenario}'
description: 'Scenario to deploy and test'
+ - string:
+ name: ADMIN_TOOL_TYPE
+ default: '{admin_tool_type}'
+ description: 'admin_tool_type: sample, fenix'
# -------------------------------