diff options
| -rwxr-xr-x | jjb/apex/apex-deploy.sh | 2 | ||||
| -rw-r--r-- | jjb/apex/apex.yml | 14 | ||||
| -rw-r--r-- | jjb/apex/apex.yml.j2 | 14 | ||||
| -rw-r--r-- | jjb/functest/functest-project-jobs.yml | 17 |
4 files changed, 23 insertions, 24 deletions
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index b3bc1416e..a47e3a5db 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -37,7 +37,7 @@ if [[ "$ARTIFACT_VERSION" =~ dev ]]; then # Settings for deploying from git workspace DEPLOY_SETTINGS_DIR="${WORKSPACE}/config/deploy" NETWORK_SETTINGS_DIR="${WORKSPACE}/config/network" - DEPLOY_CMD="opnfv-deploy" + DEPLOY_CMD="opnfv-deploy --image-dir ${WORKSPACE}/.build" CLEAN_CMD="${WORKSPACE}/ci/clean.sh" RESOURCES="${WORKSPACE}/.build/" CONFIG="${WORKSPACE}/build" diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index bdce67a44..92651e85c 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -230,18 +230,12 @@ branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' - file-paths: - - compare-type: ANT - pattern: 'ci/**' + disable-strict-forbidden-file-verification: 'true' + forbidden-file-paths: - compare-type: ANT - pattern: 'build/**' - - compare-type: ANT - pattern: 'lib/**' - - compare-type: ANT - pattern: 'config/**' + pattern: 'apex/tests/**' - compare-type: ANT - pattern: 'apex/**' - + pattern: 'docs/**' properties: - logrotate-default - build-blocker: diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index 514dd49bf..960839ad2 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -142,18 +142,12 @@ branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' - file-paths: - - compare-type: ANT - pattern: 'ci/**' + disable-strict-forbidden-file-verification: 'true' + forbidden-file-paths: - compare-type: ANT - pattern: 'build/**' - - compare-type: ANT - pattern: 'lib/**' - - compare-type: ANT - pattern: 'config/**' + pattern: 'apex/tests/**' - compare-type: ANT - pattern: 'apex/**' - + pattern: 'docs/**' properties: - logrotate-default - build-blocker: 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 |