diff options
Diffstat (limited to 'jjb/functest')
| -rw-r--r-- | jjb/functest/functest-alpine.sh | 2 | ||||
| -rw-r--r-- | jjb/functest/functest-project-jobs.yml | 17 |
2 files changed, 15 insertions, 4 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index f0e08e171..cee302699 100644 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -70,7 +70,7 @@ set +e tiers=(healthcheck smoke features vnf) for tier in ${tiers[@]}; do - FUNCTEST_IMAGE=ollivier/functest-${tier} + FUNCTEST_IMAGE=opnfv/functest-${tier} echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..." docker pull ${FUNCTEST_IMAGE}>/dev/null cmd="docker run ${envs} ${volumes} ${FUNCTEST_IMAGE}" diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml index 02da04f30..c25e4ab4a 100644 --- a/jjb/functest/functest-project-jobs.yml +++ b/jjb/functest/functest-project-jobs.yml @@ -35,17 +35,21 @@ disabled: '{obj:disabled}' + project-type: 'multijob' + parameters: - project-parameter: project: '{project}' branch: '{branch}' - - 'opnfv-build-defaults' + - 'opnfv-build-ubuntu-defaults' scm: - git-scm-gerrit triggers: - - 'functest-verify-triggers-macro' + - 'functest-verify-triggers-macro': + project: '{project}' + branch: '{branch}' builders: - shell: | @@ -98,6 +102,11 @@ disabled: '{obj:disabled}' + wrappers: + - ssh-agent-wrapper + - build-timeout: + timeout: 30 + parameters: - project-parameter: project: '{project}' @@ -128,7 +137,9 @@ - git-scm triggers: - - 'functest-docs-upload-triggers-macro' + - 'functest-docs-upload-triggers-macro': + project: '{project}' + branch: '{branch}' builders: - functest-upload-doc-artifact |