diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-11-30 14:10:16 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-11-30 14:10:16 +0000 |
| commit | bdbf886eb48fd0d4e199176a367745c9337fc257 (patch) | |
| tree | 678fa484adeee0b3293d11fd41ffbf5897bcab25 /tcwg-update-host-containers.sh | |
| parent | 82087fe5e8f27216263eeb147154562605ed8e5c (diff) | |
tcwg-update-host-containers.sh, tcwg-start-container.sh: Refactor code.
Move generic stuff to tcwg-start-container.sh from
tcwg-update-host-containers.sh.
Change-Id: Ie7b53dce0ec16a182aef5e18f009e25f61c72be2
Diffstat (limited to 'tcwg-update-host-containers.sh')
| -rwxr-xr-x | tcwg-update-host-containers.sh | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/tcwg-update-host-containers.sh b/tcwg-update-host-containers.sh index 33351ed0..30ed40db 100755 --- a/tcwg-update-host-containers.sh +++ b/tcwg-update-host-containers.sh @@ -2,7 +2,8 @@ set -ef -o pipefail -. $(dirname $0)/jenkins-helpers.sh +scripts=$(dirname $0) +. $scripts/jenkins-helpers.sh convert_args_to_variables "$@" container="${container-jenkins}" @@ -15,12 +16,6 @@ set -u if $verbose; then set -x; fi image="linaro/ci-$(print_arch_for_host localhost)-tcwg-host-ubuntu:$distro" -docker pull "$image" - -docker run --rm $image start.sh > start.sh -if docker stats --no-stream $container >/dev/null 2>&1; then - docker rm -vf $container -fi if [ x"$group" = x"default" ]; then group="all" @@ -29,4 +24,10 @@ if [ x"$group" = x"default" ]; then fi fi -bash start.sh --task $container --verbose $verbose -- $image $group +$scripts/tcwg-start-container.sh \ + --container "$container" \ + --image "$image" \ + --keep_existing false \ + --verbose "$verbose" \ + -- \ + --task $container --verbose $verbose -- $image $group |