diff options
| -rwxr-xr-x | jjb/apex/apex-upload-artifact.sh | 5 | ||||
| -rw-r--r-- | jjb/apex/apex.yml | 12 | ||||
| -rw-r--r-- | jjb/apex/apex.yml.j2 | 12 |
3 files changed, 24 insertions, 5 deletions
diff --git a/jjb/apex/apex-upload-artifact.sh b/jjb/apex/apex-upload-artifact.sh index 96c22bfac..c8862964c 100755 --- a/jjb/apex/apex-upload-artifact.sh +++ b/jjb/apex/apex-upload-artifact.sh @@ -13,10 +13,9 @@ echo "Uploading the Apex ${ARTIFACT_TYPE} artifact. This could take some time... echo "--------------------------------------------------------" echo -# source the opnfv.properties to get ARTIFACT_VERSION -source $WORKSPACE/opnfv.properties +BUILD_DIRECTORY=$WORKSPACE/../$BUILD_DIRECTORY -BUILD_DIRECTORY=${WORKSPACE}/.build +source $BUILD_DIRECTORY/../opnfv.properties importkey () { # clone releng repository diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 4137bff12..2d4e7f75b 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -412,7 +412,12 @@ gs-pathname: '{gs-pathname}' scm: - - git-scm + - git-scm-gerrit + + wrappers: + - timeout: + timeout: 90 + fail: true properties: - logrotate-default @@ -492,6 +497,11 @@ scm: - git-scm + wrappers: + - timeout: + timeout: 120 + fail: true + parameters: - project-parameter: project: '{project}' diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index 8a00d9fd1..d88fcd372 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -412,7 +412,12 @@ gs-pathname: '{gs-pathname}' scm: - - git-scm + - git-scm-gerrit + + wrappers: + - timeout: + timeout: 90 + fail: true properties: - logrotate-default @@ -492,6 +497,11 @@ scm: - git-scm + wrappers: + - timeout: + timeout: 120 + fail: true + parameters: - project-parameter: project: '{project}' |