From c87309f5a75ccc5d595f708817b97793c24c4387 Mon Sep 17 00:00:00 2001 From: Tomi Juvonen Date: Tue, 28 Aug 2018 07:10:05 +0300 Subject: [PATCH] Add Doctor maintenance job Change-Id: I1d5d83df75f25ae3f54a660e5a0cba4290a1510b Signed-off-by: Tomi Juvonen --- jjb/doctor/doctor.yaml | 83 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 5 deletions(-) diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml index 469023037..b78bab1e2 100644 --- a/jjb/doctor/doctor.yaml +++ b/jjb/doctor/doctor.yaml @@ -39,7 +39,9 @@ jobs: - 'doctor-verify-{stream}' - - 'doctor-verify-{installer}-{inspector}-{arch}-{stream}' + - 'doctor-verify-fault_management-{installer}-{inspector}-{arch}-{stream}' + - 'doctor-verify-maintenance-{installer}-{inspector}-{arch}-{stream}' + - 'doctor-verify-all-{installer}-{inspector}-{arch}-{stream}' - job-template: name: 'doctor-verify-{stream}' @@ -68,7 +70,7 @@ name: 'doctor-verify-sample' execution-type: PARALLEL projects: - - name: 'doctor-verify-apex-sample-x86_64-{stream}' + - name: 'doctor-verify-fault_management-apex-sample-x86_64-{stream}' predefined-parameters: | PROJECT=$PROJECT GERRIT_BRANCH=$GERRIT_BRANCH @@ -77,7 +79,16 @@ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE kill-phase-on: FAILURE git-revision: true - - name: 'doctor-verify-daisy-sample-x86_64-{stream}' + - name: 'doctor-verify-fault_management-daisy-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 + - name: 'doctor-verify-maintenance-apex-sample-x86_64-{stream}' predefined-parameters: | PROJECT=$PROJECT GERRIT_BRANCH=$GERRIT_BRANCH @@ -90,7 +101,7 @@ name: 'doctor-verify-congress' execution-type: PARALLEL projects: - - name: 'doctor-verify-apex-congress-x86_64-{stream}' + - name: 'doctor-verify-fault_management-apex-congress-x86_64-{stream}' predefined-parameters: | PROJECT=$PROJECT GERRIT_BRANCH=$GERRIT_BRANCH @@ -99,9 +110,17 @@ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE kill-phase-on: FAILURE git-revision: true + - multijob: + name: 'doctor-verify-sample-all' + execution-type: PARALLEL + # This would be for running all test cases with sample inspector + - multijob: + name: 'doctor-verify-congress-all' + execution-type: PARALLEL + # This would be for running all test cases with congress inspector - job-template: - name: 'doctor-verify-{installer}-{inspector}-{arch}-{stream}' + name: 'doctor-verify-fault_management-{installer}-{inspector}-{arch}-{stream}' disabled: '{obj:disabled}' node: 'doctor-{installer}-{arch}' wrappers: @@ -116,6 +135,55 @@ - 'doctor-slave-parameter' - 'doctor-parameter': inspector: '{inspector}' + test_case: 'fault_management' + scm: + - git-scm-gerrit + builders: + - 'doctor-verify-installer-inspector-builders-macro' + publishers: + - 'doctor-verify-publishers-macro' + +- job-template: + name: 'doctor-verify-maintenance-{installer}-{inspector}-{arch}-{stream}' + disabled: '{obj:disabled}' + node: 'nokia-pod1' + wrappers: + - ssh-agent-wrapper + - build-timeout: + timeout: 40 + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - '{installer}-defaults' + - 'doctor-slave-parameter' + - 'doctor-parameter': + inspector: '{inspector}' + test_case: 'maintenance' + scm: + - git-scm-gerrit + builders: + - 'doctor-verify-installer-inspector-builders-macro' + publishers: + - 'doctor-verify-publishers-macro' + +- job-template: + name: 'doctor-verify-all-{installer}-{inspector}-{arch}-{stream}' + disabled: '{obj:disabled}' + node: 'nokia-pod1' + wrappers: + - ssh-agent-wrapper + - build-timeout: + timeout: 50 + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - '{installer}-defaults' + - 'doctor-slave-parameter' + - 'doctor-parameter': + inspector: '{inspector}' + test_case: 'all' scm: - git-scm-gerrit builders: @@ -134,6 +202,11 @@ name: INSPECTOR_TYPE default: '{inspector}' description: 'inspector component' + - string: + name: TEST_CASE + default: '{test_case}' + description: 'test case: all, fault_management or maintenance' + # ------------------------------- # builder macros -- 2.16.6