diff options
author | Christophe Lyon <christophe.lyon@linaro.org> | 2017-02-20 12:33:17 +0000 |
---|---|---|
committer | Christophe Lyon <christophe.lyon@linaro.org> | 2017-02-20 12:33:17 +0000 |
commit | 77db6c2daa3b622b65499b3b9a4cae512798e7a9 (patch) | |
tree | 2bb0a82e6d4806d719cec9e60c9106e1fb670296 | |
parent | 525fdbc39c17a2271f3600d0c0eba288402cbcfc (diff) |
start-container-none.sh, start-container-schroot.sh: Update comments.
Change-Id: I07e61cc697a9827e7c43f46488a0a0f8defc6d13
-rwxr-xr-x | start-container-none.sh | 9 | ||||
-rwxr-xr-x | start-container-schroot.sh | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/start-container-none.sh b/start-container-none.sh index e451aead..8e6776eb 100755 --- a/start-container-none.sh +++ b/start-container-none.sh @@ -3,17 +3,18 @@ set -e # Pretend to start a local container. Parameters are ignored but # required to have the same interface as the other scripts in this -# directory. +# directory. We check if arch and distro match the local machine's +# values. # This script is meant to be executed from Jenkins jobs inside TCWG # lab. It prints shell commands meant to be executed in the parent # shell, consisting in: -# - a cleanup statement, to remove the container on exit for instance # - definition of ${CONTAINER}, used to prefix commands that you want # to run inside the container. +# - definition of ${CONTAINER_CLEANUP}, a cleanup statement remove the +# container on exit for instance # - definition of ${session_host} and ${session_port}, can be used for # a remote connexion to the container - usage() { echo "Usage: $0 --arch container-arch --distro flavour [--session-host host] [--session-name name] [--task {build|test}]" echo @@ -113,7 +114,7 @@ fi exec 1>&3 2>&4 cat <<EOF -ulimit -u 5000 +ulimit -u 5000 # FIXME: Does not work remotely CONTAINER="ssh -p ${session_port} -A ${session_host}" CONTAINER_CLEANUP="" session_host=${session_host} diff --git a/start-container-schroot.sh b/start-container-schroot.sh index ebf2bfdd..b9bacd88 100755 --- a/start-container-schroot.sh +++ b/start-container-schroot.sh @@ -6,12 +6,12 @@ set -e # This script is meant to be executed from Jenkins jobs inside TCWG # lab. It prints shell commands meant to be executed in the parent # shell, consisting in: -# - a cleanup statement, to remove the container on exit for instance # - definition of ${CONTAINER}, used to prefix commands that you want # to run inside the container. +# - definition of ${CONTAINER_CLEANUP}, a cleanup statement remove the +# container on exit for instance # - definition of ${session_host} and ${session_port}, can be used for # a remote connexion to the container - usage() { echo "Usage: $0 --arch container-arch --distro flavour [--session-host host] [--session-name name] [--task {build|test}]" echo @@ -94,9 +94,6 @@ fi exec 1>&3 2>&4 cat <<EOF -ulimit -u 5000 # FIXME how to support this remotely? -# Sometimes /dev/pts can't get unmounted on the first try. -# Workaround by retrying. CONTAINER="${SCHROOT} -r -c session:$session_id --preserve-environment -- " CONTAINER_CLEANUP="${SCHROOT} -f -e -c session:$session_id" session_host=${session_host} |