diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/apex/apex.yml | 3 | ||||
| -rw-r--r-- | jjb/doctor/doctor.yml | 24 |
2 files changed, 22 insertions, 5 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 8bfc53d59..7724577a0 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -59,6 +59,7 @@ - 'os-odl_l2-nofeature-ha' - 'os-odl_l2-bgpvpn-ha' - 'os-odl_l2-fdio-noha' + - 'os-odl_l2-fdio-ha' - 'os-odl_l2-sfc-noha' - 'os-odl_l3-nofeature-ha' - 'os-onos-nofeature-ha' @@ -744,7 +745,7 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'apex-deploy-baremetal-os-odl_l2-fdio-noha-{stream}' + - project: 'apex-deploy-baremetal-os-odl_l2-fdio-ha-{stream}' predefined-parameters: | BUILD_DIRECTORY=apex-build-{stream}/build OPNFV_CLEAN=yes diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index dfce40202..9a74f4e3d 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -85,9 +85,11 @@ name: OS_CREDS default: /home/jenkins/openstack.creds description: 'OpenStack credentials' - - '{installer}-defaults' - '{slave-label}-defaults' - # functest + - string: + name: INSTALLER_TYPE + default: '{installer}' + description: 'Installer used for deploying OPNFV on this POD' - string: name: DOCKER_TAG default: '{docker-tag}' @@ -95,13 +97,14 @@ - string: name: DEPLOY_SCENARIO default: 'os-nosdn-nofeature-ha' + description: 'Scenario to deploy and test' # functest-suite-parameter - string: name: FUNCTEST_SUITE_NAME default: '{project}' - string: name: TESTCASE_OPTIONS - default: '-e INSPECTOR_TYPE={inspector} -v $WORKSPACE:$HOME/opnfv/repos/doctor' + default: '-e INSPECTOR_TYPE={inspector} -v $WORKSPACE:/home/opnfv/repos/doctor' description: 'Addtional parameters specific to test case(s)' # functest-parameter - string: @@ -158,5 +161,18 @@ - 'functest-suite-builder' publishers: + - postbuildscript: + builders: + - functest-copy-suite-log: + suite: '{project}' + stream: '{stream}' + script-only-if-succeeded: False + script-only-if-failed: False - archive: - artifacts: '$HOME/opnfv/functest/results/{stream}/{project}.log' + artifacts: '*.log' + +- builder: + name: functest-copy-suite-log + builders: + - shell: | + cp $HOME/opnfv/functest/results/{stream}/{suite}.log $WORKSPACE/ |