diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/doctor/doctor.yml | 9 | ||||
| -rw-r--r-- | jjb/dovetail/dovetail-ci-jobs.yml | 24 |
2 files changed, 18 insertions, 15 deletions
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index 2267a28f7..c677ef96e 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -145,6 +145,13 @@ builders: - 'clean-workspace-log' + - shell: | + # 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 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" @@ -156,7 +163,7 @@ - archive: artifacts: 'tests/*.log' - archive: - artifacts: '$HOME/opnfv/functest/results/{stream}/{project}.log' + artifacts: 'functest_results/{project}.log' ##################################### diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml index 22bc28109..0bd32a4ab 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yml +++ b/jjb/dovetail/dovetail-ci-jobs.yml @@ -81,27 +81,23 @@ SUT: compass auto-trigger-name: 'daily-trigger-disabled' <<: *danube -#apex CI PODs - - apex-verify-master: +#-------------------------------- +# Installers not using labels +# CI PODs +# This section should only contain the installers +# that have not been switched using labels for slaves +#-------------------------------- +#apex PODs + - lf-pod1: slave-label: '{pod}' SUT: apex auto-trigger-name: 'daily-trigger-disabled' <<: *master - - apex-daily-master: + - lf-pod1: slave-label: '{pod}' SUT: apex auto-trigger-name: 'daily-trigger-disabled' - <<: *master -# - apex-verify-colorado: -# slave-label: '{pod}' -# SUT: apex -# auto-trigger-name: 'daily-trigger-disabled' -# <<: *danube -# - apex-daily-colorado: -# slave-label: '{pod}' -# SUT: apex -# auto-trigger-name: 'daily-trigger-disabled' -# <<: *danube + <<: *danube #armband CI PODs - armband-baremetal: slave-label: armband-baremetal |