X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdoctor%2Fdoctor.yml;h=3401b6d338e197cbeb20b8312e0818cdac8e9239;hb=66d0c318075ff52ae63232269cb1e6ef1880ea16;hp=7b47701b89ccbf190b78316d9d6dff1a4b561492;hpb=618c18a42c286ecec72c3cfc9a9e2524d911e5d4;p=releng.git diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index 7b47701b8..3401b6d33 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -38,8 +38,15 @@ profiler: 'poc' auto-trigger-name: 'experimental' + pod: + - arm-pod2: + slave-label: '{pod}' + - arm-pod3: + slave-label: '{pod}' + jobs: - 'doctor-verify-{stream}' + - 'doctor-{task}-{installer}-{inspector}-{pod}-{stream}' - 'doctor-{task}-{installer}-{inspector}-{stream}' - job-template: @@ -82,6 +89,32 @@ builders: - shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh" +- job-template: + name: 'doctor-{task}-{installer}-{inspector}-{pod}-{stream}' + + node: '{slave-label}' + + disabled: '{obj:disabled}' + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - 'opnfv-build-ubuntu-defaults' + + scm: + - git-scm-gerrit + + + triggers: + - '{auto-trigger-name}': + project: '{project}' + branch: '{branch}' + + builders: + - shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh" + + - job-template: name: 'doctor-{task}-{installer}-{inspector}-{stream}' @@ -149,11 +182,9 @@ # NOTE: Create symbolic link, so that we can archive file outside # of $WORKSPACE . # NOTE: We are printing all logs under 'tests/' during test run, - # so this symbolic link should not be in 'tests/'. - # Otherwise, we'll the same log twice in jenkins console log. - functest_log="$HOME/opnfv/functest/results/{stream}/{project}.log" - to_be_archived="$WORKSPACE/functest-{project}.log" - ln -sf $functest_log $to_be_archived + # so this symbolic link should not be in 'tests/'. Otherwise, + # we'll have the same log twice in jenkins console log. + ln -sfn $HOME/opnfv/functest/results/{stream} functest_results - 'functest-suite-builder' - shell: | functest_log="$HOME/opnfv/functest/results/{stream}/{project}.log" @@ -165,7 +196,7 @@ - archive: artifacts: 'tests/*.log' - archive: - artifacts: 'functest-{project}.log' + artifacts: 'functest_results/{project}.log' #####################################