diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-25 22:07:48 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-28 05:32:02 +0000 |
| commit | 655aa4c9e4b3216f2649a22d5535305015cfbbd9 (patch) | |
| tree | 8fa5f6a38ace93e2b624bd43fb6a9bf11a9632b3 /tcwg-buildfarm.sh | |
| parent | 08cdb2b1c9d5ca56f3e5f90b24bb98c082717231 (diff) | |
tcwg-buildfarm.sh: Pass explicit --session-name option to test containers
... to avoid container name clashes "$USER-<DATE>" on tester boards.
Passing "$$" as first element ensures that container will start with
a number and will be cleaned up properly.
Change-Id: I1920c3466f1e4d505b3662b8317fa72725209e2c
Diffstat (limited to 'tcwg-buildfarm.sh')
| -rwxr-xr-x | tcwg-buildfarm.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tcwg-buildfarm.sh b/tcwg-buildfarm.sh index 535a82eb..fe8c8607 100755 --- a/tcwg-buildfarm.sh +++ b/tcwg-buildfarm.sh @@ -61,10 +61,10 @@ if echo $runtests | grep -q $target; then tester_label=$(print_tester_label_for_target $target) if [ x"$tester_label" != x"" ]; then if [ x"$target" != x"aarch64-linux-gnu_ilp32" ]; then - bash -x ./jenkins-scripts/start-container-docker.sh --label $tester_label --distro ${test_container_tag} --task test --prefix test_ > test-container.sh + bash -x ./jenkins-scripts/start-container-docker.sh --label $tester_label --distro ${test_container_tag} --session-name "$$-$BUILD_NUMBER-$JOB_NAME" --task test --prefix test_ > test-container.sh else # Set weight to "2" to give VM decent amount of RAM. - bash -x ./jenkins-scripts/start-container-qemu.sh --weight 2 --label $tester_label --distro ${test_container_tag} --task test --prefix test_ --kernel_url https://dev-01.tcwglab/~tcwg-buildslave/images/ilp32/norov-Image --initrd_url https://cloud-images.ubuntu.com/releases/16.04/release/unpacked/ubuntu-16.04-server-cloudimg-arm64-initrd-generic > test-container.sh + bash -x ./jenkins-scripts/start-container-qemu.sh --weight 2 --label $tester_label --distro ${test_container_tag} --session-name "$$-$BUILD_NUMBER-$JOB_NAME" --task test --prefix test_ --kernel_url https://dev-01.tcwglab/~tcwg-buildslave/images/ilp32/norov-Image --initrd_url https://cloud-images.ubuntu.com/releases/16.04/release/unpacked/ubuntu-16.04-server-cloudimg-arm64-initrd-generic > test-container.sh fi . ./test-container.sh runtests_opt="$runtests_opt --testcontainer ${test_container_host}:${test_container_port}" |