summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2019-01-09 14:07:44 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-01-09 14:07:44 +0000
commit862d3b992eca9cb831abb8f971801cb1c8c7c13f (patch)
treee73b728849d0b3ac53b1ce2c71ed5faccb652a5c
parentcabe8b5fdab4e7bd198c8443ce9d551495483282 (diff)
parentcc290b2f937a2edbd60a5d2d1e20f333dfc7eb88 (diff)
Merge "Doctor to run Fenix as admin tool"
-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'
# -------------------------------