diff options
| author | Christophe Lyon <christophe.lyon@linaro.org> | 2016-11-09 18:07:00 +0100 |
|---|---|---|
| committer | Christophe Lyon <christophe.lyon@linaro.org> | 2016-12-14 14:37:10 +0000 |
| commit | 853e342b1e84c83c64009cc541dae646792462f7 (patch) | |
| tree | 2137585a3de297266b36200d5fa152f14afb579c | |
| parent | 99f84b19ecaead8d51bf7bc9a1309b6c38c81b9c (diff) | |
tcwg-make-release: Switch to use jenkins-scripts repo.
tcwg-test-release: Likewise.
Change-Id: I3d9172bf30fab9596d1a545baae48d2e3c474323
| -rw-r--r-- | tcwg-make-release.yaml | 7 | ||||
| -rw-r--r-- | tcwg-test-release.yaml | 13 |
2 files changed, 12 insertions, 8 deletions
diff --git a/tcwg-make-release.yaml b/tcwg-make-release.yaml index b874f2304f..dbd81cb6dc 100644 --- a/tcwg-make-release.yaml +++ b/tcwg-make-release.yaml @@ -43,6 +43,10 @@ name: abe_branch default: refs/heads/master description: 'ABE revision to test' + - string: + name: scripts_branch + default: master + description: 'Scripts revision to use' - choice: name: debug choices: @@ -149,7 +153,8 @@ exit 1 ;; esac - ${shell} ${WORKSPACE}/abe/scripts/MakeRelease.job --target ${target}${tcwg_release:+ --date ${tcwg_release}} --fileserver ${fileserver} --toolchainconfig ${toolchain_config} + git clone -b $scripts_branch --depth 1 https://git-us.linaro.org/toolchain/jenkins-scripts + ${shell} ${WORKSPACE}/jenkins-scripts/MakeRelease.job --abedir=$WORKSPACE/abe --target ${target}${tcwg_release:+ --date ${tcwg_release}} --fileserver ${fileserver} --toolchainconfig ${toolchain_config} if test $? -gt 0; then exit 1 fi diff --git a/tcwg-test-release.yaml b/tcwg-test-release.yaml index bf46830be7..9b0f40af98 100644 --- a/tcwg-test-release.yaml +++ b/tcwg-test-release.yaml @@ -19,9 +19,9 @@ default: '' description: 'The GCC binary tarball to test' - string: - name: abe_branch - default: refs/heads/test - description: 'ABE revision to use ' + name: scripts_branch + default: refs/remotes/origin/master + description: 'Scripts revision to use ' - string: name: release default: @@ -42,14 +42,13 @@ display-name: 'TCWG Test Release' scm: - git: - url: https://git-us.linaro.org/toolchain/abe.git + url: https://git-us.linaro.org/toolchain/jenkins-scripts.git refspec: +refs/changes/*:refs/remotes/changes/* branches: - - ${abe_branch} + - ${scripts_branch} skip-tag: true shallow-clone: true wipe-workspace: true - basedir: abe wrappers: - timeout: timeout: 300 @@ -77,7 +76,7 @@ exit 1 fi - ${shell} ${WORKSPACE}/abe/scripts/TestRelease.job --tarball ${tarball_url} + ${shell} ${WORKSPACE}/TestRelease.job --tarball ${tarball_url} exit $? publishers: |