diff options
| author | Andrew McDermott <andrew.mcdermott@linaro.org> | 2015-03-12 16:17:22 +0000 |
|---|---|---|
| committer | Andrew McDermott <andrew.mcdermott@linaro.org> | 2015-03-12 16:27:45 +0000 |
| commit | e5451b4d50925e4c54c7aa97059a37a085457cd4 (patch) | |
| tree | c6c98c73bc0518ccf1d1459de23dce04a40e2c27 | |
| parent | fb7d436dcd4e6844f5ec512f22c99bb0759935af (diff) | |
Parameterize the github/4ad/go branch to build
| -rwxr-xr-x | build-arm64-go.sh | 3 | ||||
| -rw-r--r-- | dummy-ssh-job.yaml | 1 | ||||
| -rw-r--r-- | full-deploy-job.yaml | 1 | ||||
| -rw-r--r-- | lavatest.yaml | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/build-arm64-go.sh b/build-arm64-go.sh index 3fdca43..46c8597 100755 --- a/build-arm64-go.sh +++ b/build-arm64-go.sh @@ -3,6 +3,7 @@ set -eu : ${LAVA_USE_PREBUILT_BOOTSTRAP_COMPILER:="no"} +: ${LAVA_URL_PREBUILT_BOOTSTRAP_COMPILER:="http://people.linaro.org/~andrew.mcdermott/go-armhf/go1.4.tar.bz2"} if [ "${LAVA_USE_PREBUILT_BOOTSTRAP_COMPILER}" = "yes" ]; then : ${LAVA_URL_PREBUILT_BOOTSTRAP_COMPILER:?"No URL for bootstrap compiler"} @@ -25,7 +26,7 @@ else fi rm -rf go -git clone --depth=1 http://github.com/4ad/go +git clone --depth=1 http://github.com/4ad/go -b ${LAVA_GO_BRANCH:-merge.arm64} export GOROOT_BOOTSTRAP=$PWD/go1.4 export GOROOT_FINAL=/usr/local/go diff --git a/dummy-ssh-job.yaml b/dummy-ssh-job.yaml index 5076963..17e14c4 100644 --- a/dummy-ssh-job.yaml +++ b/dummy-ssh-job.yaml @@ -15,4 +15,5 @@ actions: LAVA_SLEEP_FOR_ACCESS: 0 LAVA_USE_PREBUILT_BOOTSTRAP_COMPILER: 'no' LAVA_URL_PREBUILT_BOOTSTRAP_COMPILER: 'http://people.linaro.org/~andrew.mcdermott/go-armhf/go1.4.tar.bz2' + LAVA_GO_BRANCH: 'merge.arm64' timeout: 900 diff --git a/full-deploy-job.yaml b/full-deploy-job.yaml index 9792fca..776ca97 100644 --- a/full-deploy-job.yaml +++ b/full-deploy-job.yaml @@ -71,6 +71,7 @@ actions: LAVA_SLEEP_FOR_ACCESS: 0 LAVA_USE_PREBUILT_BOOTSTRAP_COMPILER: 'no' LAVA_URL_PREBUILT_BOOTSTRAP_COMPILER: 'http://people.linaro.org/~andrew.mcdermott/go-armhf/go1.4.tar.bz2' + LAVA_GO_BRANCH: 'merge.arm64' timeout: 900 - command: submit_results diff --git a/lavatest.yaml b/lavatest.yaml index 8d195e2..f06b11e 100644 --- a/lavatest.yaml +++ b/lavatest.yaml @@ -16,6 +16,7 @@ run: - 'export LAVA_USE_PREBUILT_BOOTSTRAP_COMPILER' - 'export LAVA_URL_PREBUILT_BOOTSTRAP_COMPILER' - 'export LAVA_SLEEP_FOR_ACCESS' + - 'export LAVA_GO_BRANCH' - 'env' - './build-arm64-go.sh' - 'lava-test-run-attach go.tar.gz' |