From cc290b2f937a2edbd60a5d2d1e20f333dfc7eb88 Mon Sep 17 00:00:00 2001
From: Tomi Juvonen <tomi.juvonen@nokia.com>
Date: Fri, 21 Dec 2018 12:08:01 +0200
Subject: 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>
---
 jjb/doctor/doctor.yaml | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'jjb/doctor')

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
@@ -89,6 +89,19 @@
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               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
@@ -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'
 
 
 # -------------------------------
-- 
cgit 1.2.3-korg