diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-28 09:02:36 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-28 09:02:36 +0000 |
| commit | 97f5f0cbf8c147719eebf11d7cb3a3990ffebe9c (patch) | |
| tree | d90eb1c5dafda92bd0179fc5042d7bfd060f8ed3 /tcwg-buildfarm.sh | |
| parent | 69011f21ffa6cd45c09fd143bce287ffe8834ca0 (diff) | |
tcwg-buildfarm.sh: Fix session_name for start-container-docker.
Make sure session_name has only allowed characters.
Change-Id: I12820281f758841170f3a9aef5d7ed20e33a214e
Diffstat (limited to 'tcwg-buildfarm.sh')
| -rwxr-xr-x | tcwg-buildfarm.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tcwg-buildfarm.sh b/tcwg-buildfarm.sh index fe8c8607..c5709d6f 100755 --- a/tcwg-buildfarm.sh +++ b/tcwg-buildfarm.sh @@ -60,11 +60,13 @@ if echo $runtests | grep -q $target; then tester_label=$(print_tester_label_for_target $target) if [ x"$tester_label" != x"" ]; then + session_name=$(print_docker_name "$$-$BUILD_NUMBER-$JOB_NAME") + if [ x"$target" != x"aarch64-linux-gnu_ilp32" ]; then - 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 + bash -x ./jenkins-scripts/start-container-docker.sh --label $tester_label --distro ${test_container_tag} --session-name "$session_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} --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 + bash -x ./jenkins-scripts/start-container-qemu.sh --weight 2 --label $tester_label --distro ${test_container_tag} --session-name "$session_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}" |