This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "ABE".
The branch, bernie/benchmarking has been updated discards d00fb95a1b5dbe3a84fa158df872e1d2c4c49d06 (commit) discards d758ec431131655032bc7de12c0e6f266d9723c2 (commit) discards a2a4b6c0560e41e2415f1f18fcae47d2d92aba19 (commit) discards 84cca05ccf4aa3df6cd6773735f0914ead7b460a (commit) discards b00b97f215de59b71921ab500becdfb4c44c07d0 (commit) via 59e7985181ad89ab8b30c905cb477235cb764eb7 (commit) via a7ee16591120dcf47e1d54687f4646bacdeaf953 (commit) via 741828f6c4c919ab16ee3c1cd37dc611aacc242a (commit) via 279a031a7678cf5b1f3ddec3ae897af3e273c4fc (commit) via 57ef5031aa5d07f5af4937586a72caa0121fbdca (commit) via 8a2736ae2903ce0a5797b8e9134cbd575e105f10 (commit)
This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this:
* -- * -- B -- O -- O -- O (d00fb95a1b5dbe3a84fa158df872e1d2c4c49d06) \ N -- N -- N (59e7985181ad89ab8b30c905cb477235cb764eb7)
When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B.
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 59e7985181ad89ab8b30c905cb477235cb764eb7 Author: Bernard Ogden bernie.ogden@linaro.org Date: Thu May 21 12:53:39 2015 +0200
--no-print-directory now handled by SPEC sources
Change-Id: I83179b44402ef6d9ac87ca303f3c95b2fd01d9c5
diff --git a/config/CPU2000.conf b/config/CPU2000.conf index b361aa6..b0bc925 100644 --- a/config/CPU2000.conf +++ b/config/CPU2000.conf @@ -4,12 +4,7 @@ depends="" # spec does not have a configure script configure="no"
-#Note that the makefile will cross-compile the benchmark, but only ever natively compiles the tools -#--no-print-directory is important, as we otherwise catch paths as part of the checksum that identifies -#whether the build options have changed. This is a problem when cross-building. Or even when native -#building and passing the results around, which appears to be an expected (supported?) use case, see -#http://www.spec.org/cpu2006/docs/runspec.html#section3.1.1 -default_makeflags="BUILD=${build} --no-print-directory" +default_makeflags="BUILD=${build}" if test x"${build}" = x"${target}"; then default_makeflags="${default_makeflags} CROSS_COMPILE=" else diff --git a/config/CPU2006.conf b/config/CPU2006.conf index b361aa6..b0bc925 100644 --- a/config/CPU2006.conf +++ b/config/CPU2006.conf @@ -4,12 +4,7 @@ depends="" # spec does not have a configure script configure="no"
-#Note that the makefile will cross-compile the benchmark, but only ever natively compiles the tools -#--no-print-directory is important, as we otherwise catch paths as part of the checksum that identifies -#whether the build options have changed. This is a problem when cross-building. Or even when native -#building and passing the results around, which appears to be an expected (supported?) use case, see -#http://www.spec.org/cpu2006/docs/runspec.html#section3.1.1 -default_makeflags="BUILD=${build} --no-print-directory" +default_makeflags="BUILD=${build}" if test x"${build}" = x"${target}"; then default_makeflags="${default_makeflags} CROSS_COMPILE=" else
commit a7ee16591120dcf47e1d54687f4646bacdeaf953 Author: Bernard Ogden bernie.ogden@linaro.org Date: Fri May 15 05:16:56 2015 -0600
Use nc.traditional if available
nc.traditional seems more reliable than nc.openbsd - in particular, it always seems to get messages sent for it. The only drawback seems to be that it always exits when the current connection closes. We already cope with this limitation to support nc.traditional at all.
Change-Id: I3fb90c548bfad88fd0fdd2151f1c74c4d81c69e8
diff --git a/scripts/establish_listener.sh b/scripts/establish_listener.sh index 88d7844..5266faa 100755 --- a/scripts/establish_listener.sh +++ b/scripts/establish_listener.sh @@ -108,10 +108,10 @@ for ((listener_port=${start_port}; listener_port < ${end_port}; listener_port++) #Try to listen on the port. nc will fail if something has snatched it. echo "Attempting to establish listener on ${listener_addr}:${listener_port}" 1>&2
- if test -e /bin/nc.openbsd; then - /bin/nc.openbsd -l "${listener_addr}" "${listener_port}" >> "${listener_file}"& - elif test -e /bin/nc.traditional; then + if test -e /bin/nc.traditional; then /bin/nc.traditional -l -s "${listener_addr}" -p "${listener_port}" >> "${listener_file}"& + elif test -e /bin/nc.openbsd; then + /bin/nc.openbsd -l "${listener_addr}" "${listener_port}" >> "${listener_file}"& else echo "Unable to identify netcat" 1>&2 exit 1
commit 741828f6c4c919ab16ee3c1cd37dc611aacc242a Author: Bernard Ogden bernie.ogden@linaro.org Date: Thu May 21 12:46:28 2015 +0200
Set gateway to target if there is no gateway
Change-Id: I8579588acba56b72e15d382d1a1ff4f07ce7e148
diff --git a/scripts/runbenchmark.sh b/scripts/runbenchmark.sh index e153cc5..e966952 100755 --- a/scripts/runbenchmark.sh +++ b/scripts/runbenchmark.sh @@ -213,7 +213,9 @@ if test $? -eq 0; then echo "+++ Failed to acquire LAVA target ${lava_target}" 1>&2 exit 1 fi -else +fi + +if test -z "${gateway:-}"; then gateway="${ip/*@}" fi #LAVA-agnostic from here, apart from a section in the exit handler, and bgread
commit 279a031a7678cf5b1f3ddec3ae897af3e273c4fc Author: Bernard Ogden bernie.ogden@linaro.org Date: Thu May 21 12:45:45 2015 +0200
Ensure SSH key is specified in all code paths
Change-Id: I91a3cb88b1f722c8519f448b4810a4bbe464b386
diff --git a/scripts/runbenchmark.sh b/scripts/runbenchmark.sh index c6a1707..e153cc5 100755 --- a/scripts/runbenchmark.sh +++ b/scripts/runbenchmark.sh @@ -161,6 +161,7 @@ clean_benchmark() exit "${error}" }
+ssh_opts="-F /dev/null ${LAVA_SSH_KEYFILE:+-o IdentityFile=${LAVA_SSH_KEYFILE}}" establish_listener_opts=
#Handle LAVA case @@ -177,7 +178,7 @@ if test $? -eq 0; then 2) echo "Unable to determing location w.r.t. lava lab: assuming outside" 1>&2 ;; 1) gateway=lab.validation.linaro.org - ssh_opts="-F /dev/null ${LAVA_SSH_KEYFILE:+-o IdentityFile=${LAVA_SSH_KEYFILE}} -o ProxyCommand='ssh ${lava_user}@${gateway} nc -q0 %h %p'" + ssh_opts="${ssh_opts} ProxyCommand='ssh ${lava_user}@${gateway} nc -q0 %h %p'" establish_listener_opts="-f 10.0.0.10:${lava_user}@${gateway}" esac fi @@ -214,7 +215,6 @@ if test $? -eq 0; then fi else gateway="${ip/*@}" - ssh_opts= fi #LAVA-agnostic from here, apart from a section in the exit handler, and bgread #monitoring of the LAVA process while we're waiting for the benchmark to end
commit 57ef5031aa5d07f5af4937586a72caa0121fbdca Author: Bernard Ogden bernie.ogden@linaro.org Date: Mon May 11 07:57:59 2015 -0600
Allow user to declare that script's running in lab
This overrides checks as to where we are.
Change-Id: Icda428c878001e284b89a1dae55e8b34e1f96cab
diff --git a/scripts/lava.sh b/scripts/lava.sh index 7064354..8bdc639 100755 --- a/scripts/lava.sh +++ b/scripts/lava.sh @@ -221,8 +221,12 @@ sed -i "s+^(.*"job_name":)[^"]*".*"[^,]*(,?)[[:blank:]]*$+\1 "${lava sed -i "s+^(.*"server":)[^"]*".*"[^,]*(,?)[[:blank:]]*$+\1 "https://%24%7Blava_user%7D@%24%7Blava_server%7D%5C%22%5C2+" "${json_copy}" sed -i "s+^(.*"stream":)[^"]*".*"[^,]*(,?)[[:blank:]]*$+\1 "/private/personal/${lava_user}/"\2+" "${json_copy}"
-lava_network "${lava_user}" -in_lab=$? +if test -z "${LAVA_IN_LAB}"; then + lava_network "${lava_user}" + in_lab=$? +else + in_lab=0 +fi if test ${in_lab} -eq 2; then echo "Unable to determine whether I am inside the LAVA lab, assuming that I am not" 1>&2 fi diff --git a/scripts/runbenchmark.sh b/scripts/runbenchmark.sh index 2d52689..c6a1707 100755 --- a/scripts/runbenchmark.sh +++ b/scripts/runbenchmark.sh @@ -161,6 +161,8 @@ clean_benchmark() exit "${error}" }
+establish_listener_opts= + #Handle LAVA case echo "${ip}" | grep '.json$' > /dev/null if test $? -eq 0; then @@ -169,15 +171,16 @@ if test $? -eq 0; then echo "Unable to find username from ${lava_url}" 1>&2 exit 1 fi - lava_network "${lava_user}" - case $? in - 2) echo "Unable to determing location w.r.t. lava lab: assuming outside" 1>&2 ;; - 1) - gateway=lab.validation.linaro.org - ssh_opts="-F /dev/null ${LAVA_SSH_KEYFILE:+-o IdentityFile=${LAVA_SSH_KEYFILE}} -o ProxyCommand='ssh ${lava_user}@${gateway} nc -q0 %h %p'" - establish_listener_opts="-f 10.0.0.10:${lava_user}@${gateway}" - esac - + if test -z "${LAVA_IN_LAB}"; then + lava_network "${lava_user}" + case $? in + 2) echo "Unable to determing location w.r.t. lava lab: assuming outside" 1>&2 ;; + 1) + gateway=lab.validation.linaro.org + ssh_opts="-F /dev/null ${LAVA_SSH_KEYFILE:+-o IdentityFile=${LAVA_SSH_KEYFILE}} -o ProxyCommand='ssh ${lava_user}@${gateway} nc -q0 %h %p'" + establish_listener_opts="-f 10.0.0.10:${lava_user}@${gateway}" + esac + fi lava_target="${ip}" ip='' tee_output=/dev/console @@ -212,7 +215,6 @@ if test $? -eq 0; then else gateway="${ip/*@}" ssh_opts= - establish_listener_opts= fi #LAVA-agnostic from here, apart from a section in the exit handler, and bgread #monitoring of the LAVA process while we're waiting for the benchmark to end
commit 8a2736ae2903ce0a5797b8e9134cbd575e105f10 Author: Bernard Ogden bernie.ogden@linaro.org Date: Thu Jul 9 10:51:40 2015 +0200
Remove private network check
diff --git a/scripts/benchmark.sh b/scripts/benchmark.sh index 67f875f..a4d696b 100755 --- a/scripts/benchmark.sh +++ b/scripts/benchmark.sh @@ -78,13 +78,6 @@ if test "$((`umask` & 077))" -ne 63; then exit 1 fi fi - -#TODO: Really, this check should operate on the route from the git server to localhost -. "${topdir}/scripts/benchutil.sh" -if ! check_private_route localhost; then - echo "Do not appear to be on private network, conservatively aborting" 1>&2 - exit 1 -fi #End sanity checks
tag="" diff --git a/scripts/benchutil.sh b/scripts/benchutil.sh index 7111542..66a6c6d 100644 --- a/scripts/benchutil.sh +++ b/scripts/benchutil.sh @@ -156,59 +156,3 @@ function bgread return 0 }
-#Use ping to perform a traceroute-like check of route to some target -#It's probably not guaranteed that other protocols (or even future pings) will -#take the same route, this is just a conservative sanity check. -function check_private_route -{ - local myaddr - local pingout - local ttl - local retry - - if test x"${1:-}" = x; then - echo "check_private_route requires a parameter" 1>&2 - return 1 - fi - - #Extended regexps (use grep -E) - local block24='10.[[:digit:]]+.[[:digit:]]+.[[:digit:]]+' - local block20='172.(1[6-9]|2[0-9]|3[0-1]).[[:digit:]]+.[[:digit:]]+' - local block16='192.168.[[:digit:]]+.[[:digit:]]+' - - myaddr="`get_addr`" - if test $? -ne 0; then - echo "Cannot get a usable IP address to check route" 1>&2 - return 1 - fi - - #Check we're on something in a private network to start with - if ! echo "${myaddr}" | grep -Eq "^(${block24}|${block20}|${block16})$"; then - echo "Own IP address ${myaddr} does not match any known private network range" 1>&2 - return 1 - fi - - #Check every stop along the way to target. DO NOT check target itself - assume - #that we don't hop off our network even if its IP appears to be non-private. - #This is a crude, but generic and unprivileged, way of doing traceroute - what - #we really want is the routing tables, I think. - for ttl in {1..10}; do - #This thing sometimes fails spuriously - I can't fathom why, so we retry - #a few times. Sigh. - for retry in {1..5}; do - pingout="`ping -n -t ${ttl} -c 1 $1`" - if test $? -eq 0; then - return 0 #We've reached the target - fi - echo "${pingout}" | grep -Eq "^From (${block24}|${block20}|${block16}) icmp_seq=1 Time to live exceeded$" - if test $? -eq 0; then - continue 2 - fi - done - echo "Surprising stop on hop ${ttl} on route to benchmark target: '${pingout}'" 1>&2 - return 1 - done - - echo "Failed to reach benchmark target within ${ttl} hops" 1>&2 - return 1 -} diff --git a/scripts/runbenchmark.sh b/scripts/runbenchmark.sh index b979d5e..2d52689 100755 --- a/scripts/runbenchmark.sh +++ b/scripts/runbenchmark.sh @@ -176,12 +176,6 @@ if test $? -eq 0; then gateway=lab.validation.linaro.org ssh_opts="-F /dev/null ${LAVA_SSH_KEYFILE:+-o IdentityFile=${LAVA_SSH_KEYFILE}} -o ProxyCommand='ssh ${lava_user}@${gateway} nc -q0 %h %p'" establish_listener_opts="-f 10.0.0.10:${lava_user}@${gateway}" - - #LAVA targets need to boot - do an early check that the route to the gateway is private, so that we can fail fast - if ! check_private_route "${gateway}"; then - echo "Failed to confirm that route to target is private, conservatively aborting" 1>&2 - exit 1 - fi esac
lava_target="${ip}" @@ -265,10 +259,6 @@ if test $? -ne 0; then echo "Unable to get tmpdir on target" 1>&2 exit 1 fi -if ! check_private_route "${gateway}"; then - echo "Failed to confirm that route to target is private, conservatively aborting" 1>&2 - exit 1 -fi for thing in "${buildtar}" "${topdir}/scripts/controlledrun.sh" "${confdir}/${device}.services"; do (. "${topdir}"/lib/common.sh; remote_upload -r 3 "${ip}" "${thing}" "${target_dir}/`basename ${thing}`" ${ssh_opts}) if test $? -ne 0; then @@ -395,11 +385,6 @@ if test ${error} -ne 0; then error=1 fi
-#Several days might have passed, re-check the route -if ! check_private_route "${gateway}"; then - echo "Failed to confirm that route to target is private, conservatively aborting" 1>&2 - exit 1 -fi for log in ../stdout ../stderr linarobenchlog ${benchlog}; do mkdir -p "${logdir}/${benchmark}.git/`dirname ${log}`" (. "${topdir}"/lib/common.sh; remote_download -r 3 "${ip}" "${target_dir}/${benchmark}.git/${log}" "${logdir}/${benchmark}.git/${log}" ${ssh_opts})
-----------------------------------------------------------------------
Summary of changes: scripts/benchmark.sh | 7 ------- scripts/benchutil.sh | 56 ------------------------------------------------- scripts/runbenchmark.sh | 15 ------------- 3 files changed, 78 deletions(-)
hooks/post-receive