Release build fixes
- Set timeout for release build to 2 hours - this job should
never fail due to a timeout.
- Fix bug that was locking/unlocking the wrong gerrit branch
Change-Id: I66bc52b496ed1441df8279018ed79990327d4bac
diff --git a/jjb/onos/onos-release-build.sh b/jjb/onos/onos-release-build.sh
index 1c4f5c8..8d488b8 100644
--- a/jjb/onos/onos-release-build.sh
+++ b/jjb/onos/onos-release-build.sh
@@ -36,10 +36,10 @@
export WIKI_USER
# lock gerrit to prevent checkins
-ssh -p 29418 gerrit.onosproject.org projectlock lock onos master
+ssh -p 29418 gerrit.onosproject.org projectlock lock onos ${GERRIT_BRANCH}
# unlock on exit
-trap "ssh -p 29418 gerrit.onosproject.org projectlock unlock onos master" EXIT
+trap "ssh -p 29418 gerrit.onosproject.org projectlock unlock onos ${GERRIT_BRANCH}" EXIT
# get the sources
git checkout $GERRIT_BRANCH
diff --git a/jjb/onos/onos-verify.yaml b/jjb/onos/onos-verify.yaml
index d485cc9..984a9d9 100644
--- a/jjb/onos/onos-verify.yaml
+++ b/jjb/onos/onos-verify.yaml
@@ -677,7 +677,7 @@
project-name: onos-release-build
project: onos
- build-timeout: '90'
+ build-timeout: '240'
build-node: 'ubuntu16.04-basebuild-8c-15g'
stream: 'master'