diff options
author | Gaurav Shah <gauravsh@chromium.org> | 2012-02-08 11:16:57 -0800 |
---|---|---|
committer | Gerrit <chrome-bot@google.com> | 2012-02-08 12:09:18 -0800 |
commit | f5b5b4ce5f055ab92fce5c0529b9b10d7688004d (patch) | |
tree | 89622b6e0345dda40525525fec6b2ef440b77a16 | |
parent | 14d982a2beb1678ddf36e888275c665f8108480f (diff) | |
download | vboot-f5b5b4ce5f055ab92fce5c0529b9b10d7688004d.tar.gz |
signer tests: Allow different appids for canary channel images
If the channel is canary, allow appid to match the value of
expected_appid_canary in the ensure sane lsb release test
configuration.
BUG=chromium-os:25437
TEST=manually tested on an image with and without the channel being canary.
Change-Id: I6bf71adbe0fc090ef777c28d24c53eaa8be18404
Reviewed-on: https://gerrit.chromium.org/gerrit/15509
Tested-by: Gaurav Shah <gauravsh@chromium.org>
Reviewed-by: Scott Zawalski <scottz@chromium.org>
Commit-Ready: Gaurav Shah <gauravsh@chromium.org>
-rwxr-xr-x | scripts/image_signing/ensure_sane_lsb-release.sh | 10 | ||||
-rw-r--r-- | scripts/image_signing/sample-test-configs/ensure_sane_lsb-release.config | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/scripts/image_signing/ensure_sane_lsb-release.sh b/scripts/image_signing/ensure_sane_lsb-release.sh index ffc78dd2..bab5b1fa 100755 --- a/scripts/image_signing/ensure_sane_lsb-release.sh +++ b/scripts/image_signing/ensure_sane_lsb-release.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -149,7 +149,13 @@ main() { cut -d - -f 1,2) # a copy of the board string with '-' squished to variable-name-safe '_'. local boardvar=${board//-/_} - eval "expected_appid=\"\$expected_appid_$boardvar\"" + # For a canary channel, appid maybe a different default value. + if ! lsbequals $lsb CHROMEOS_RELEASE_TRACK "canary-channel" \ + >/dev/null 2>&1; then + eval "expected_appid=\"\$expected_appid_$boardvar\"" + else + eval "expected_appid=\"\$expected_appid_canary\"" + fi lsbequals $lsb CHROMEOS_RELEASE_APPID "$expected_appid" || testfail=1 else # unrecognized board testfail=1 diff --git a/scripts/image_signing/sample-test-configs/ensure_sane_lsb-release.config b/scripts/image_signing/sample-test-configs/ensure_sane_lsb-release.config index 6811a018..831fed8e 100644 --- a/scripts/image_signing/sample-test-configs/ensure_sane_lsb-release.config +++ b/scripts/image_signing/sample-test-configs/ensure_sane_lsb-release.config @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -10,10 +10,12 @@ expected_release_name="Chrome OS" # List boards here expected_boards=( x86-mario + x86-alex-signed-mp-v3keys ) # List track names here expected_release_tracks=( + canary-channel beta-channel dev-channel ) @@ -23,3 +25,5 @@ expected_release_tracks=( # expected boards (above), with hyphens transposed to # underscores (to be legal in variable names). expected_appid_x86_mario="{87efface-864d-49a5-9bb3-4b050a7c227a}" +expected_appid_x86_alex="{C776D42E-287A-435E-8BA7-E770BD30B46D}" +expected_appid_canary="{90F229CE-83E2-4FAF-8479-E368A34938B1}" |