diff options
author | Mykhaylo Sul <ext-mykhaylo.sul@here.com> | 2019-04-03 20:39:01 +0200 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2019-04-29 09:57:27 +0200 |
commit | 8f34415079cabc543c4ce495f9fe8b441b164313 (patch) | |
tree | a7fa6c4ab8912194130640e19cc64fcf957e931e /classes/image_types_ostree.bbclass | |
parent | 48fe68253536e72b2b374b83dfdc89a72185311e (diff) | |
download | meta-updater-8f34415079cabc543c4ce495f9fe8b441b164313.tar.gz |
OTA-2418: Remove example.com URL from automated garage-sign usage
Signed-off-by: Mykhaylo Sul <ext-mykhaylo.sul@here.com>
Diffstat (limited to 'classes/image_types_ostree.bbclass')
-rw-r--r-- | classes/image_types_ostree.bbclass | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index f3b1b33..134f5f5 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -224,6 +224,11 @@ IMAGE_CMD_garagesign () { | |||
224 | # Push may fail due to race condition when multiple build machines try to push simultaneously | 224 | # Push may fail due to race condition when multiple build machines try to push simultaneously |
225 | # in which case targets.json should be pulled again and the whole procedure repeated | 225 | # in which case targets.json should be pulled again and the whole procedure repeated |
226 | push_success=0 | 226 | push_success=0 |
227 | target_url="" | ||
228 | if [ -n "${GARAGE_TARGET_URL}" ]; then | ||
229 | target_url='--url ${GARAGE_TARGET_URL}' | ||
230 | fi | ||
231 | |||
227 | for push_retries in $( seq 3 ); do | 232 | for push_retries in $( seq 3 ); do |
228 | garage-sign targets pull --repo tufrepo \ | 233 | garage-sign targets pull --repo tufrepo \ |
229 | --home-dir ${GARAGE_SIGN_REPO} | 234 | --home-dir ${GARAGE_SIGN_REPO} |
@@ -233,7 +238,7 @@ IMAGE_CMD_garagesign () { | |||
233 | --format OSTREE \ | 238 | --format OSTREE \ |
234 | --version ${target_version} \ | 239 | --version ${target_version} \ |
235 | --length 0 \ | 240 | --length 0 \ |
236 | --url "${GARAGE_TARGET_URL}" \ | 241 | ${target_url} \ |
237 | --sha256 ${ostree_target_hash} \ | 242 | --sha256 ${ostree_target_hash} \ |
238 | --hardwareids ${SOTA_HARDWARE_ID} | 243 | --hardwareids ${SOTA_HARDWARE_ID} |
239 | garage-sign targets sign --repo tufrepo \ | 244 | garage-sign targets sign --repo tufrepo \ |