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:56:35 +0200 |
| commit | 054e56ff57b86fb0e6cf3ed84d07e237b64b1cb5 (patch) | |
| tree | d4387f172c1093325457f47e4939c470e430459a | |
| parent | bd5de22dab8a5baf41eabd24e8200844f66ce6e3 (diff) | |
| download | meta-updater-054e56ff57b86fb0e6cf3ed84d07e237b64b1cb5.tar.gz | |
OTA-2418: Remove example.com URL from automated garage-sign usage
Signed-off-by: Mykhaylo Sul <ext-mykhaylo.sul@here.com>
| -rw-r--r-- | classes/image_types_ostree.bbclass | 7 | ||||
| -rw-r--r-- | classes/sota.bbclass | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 41327e1..56d4d76 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
| @@ -212,6 +212,11 @@ IMAGE_CMD_garagesign () { | |||
| 212 | # Push may fail due to race condition when multiple build machines try to push simultaneously | 212 | # Push may fail due to race condition when multiple build machines try to push simultaneously |
| 213 | # in which case targets.json should be pulled again and the whole procedure repeated | 213 | # in which case targets.json should be pulled again and the whole procedure repeated |
| 214 | push_success=0 | 214 | push_success=0 |
| 215 | target_url="" | ||
| 216 | if [ -n "${GARAGE_TARGET_URL}" ]; then | ||
| 217 | target_url='--url ${GARAGE_TARGET_URL}' | ||
| 218 | fi | ||
| 219 | |||
| 215 | for push_retries in $( seq 3 ); do | 220 | for push_retries in $( seq 3 ); do |
| 216 | garage-sign targets pull --repo tufrepo \ | 221 | garage-sign targets pull --repo tufrepo \ |
| 217 | --home-dir ${GARAGE_SIGN_REPO} | 222 | --home-dir ${GARAGE_SIGN_REPO} |
| @@ -221,7 +226,7 @@ IMAGE_CMD_garagesign () { | |||
| 221 | --format OSTREE \ | 226 | --format OSTREE \ |
| 222 | --version ${target_version} \ | 227 | --version ${target_version} \ |
| 223 | --length 0 \ | 228 | --length 0 \ |
| 224 | --url "${GARAGE_TARGET_URL}" \ | 229 | ${target_url} \ |
| 225 | --sha256 ${ostree_target_hash} \ | 230 | --sha256 ${ostree_target_hash} \ |
| 226 | --hardwareids ${SOTA_HARDWARE_ID} | 231 | --hardwareids ${SOTA_HARDWARE_ID} |
| 227 | garage-sign targets sign --repo tufrepo \ | 232 | garage-sign targets sign --repo tufrepo \ |
diff --git a/classes/sota.bbclass b/classes/sota.bbclass index 92b4c43..7ffcd23 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass | |||
| @@ -36,7 +36,7 @@ GARAGE_SIGN_REPO ?= "${DEPLOY_DIR_IMAGE}/garage_sign_repo" | |||
| 36 | GARAGE_SIGN_KEYNAME ?= "garage-key" | 36 | GARAGE_SIGN_KEYNAME ?= "garage-key" |
| 37 | GARAGE_TARGET_NAME ?= "${OSTREE_BRANCHNAME}" | 37 | GARAGE_TARGET_NAME ?= "${OSTREE_BRANCHNAME}" |
| 38 | GARAGE_TARGET_VERSION ?= "" | 38 | GARAGE_TARGET_VERSION ?= "" |
| 39 | GARAGE_TARGET_URL ?= "https://example.com/" | 39 | GARAGE_TARGET_URL ?= "" |
| 40 | 40 | ||
| 41 | SOTA_MACHINE ??="none" | 41 | SOTA_MACHINE ??="none" |
| 42 | SOTA_MACHINE_rpi ?= "raspberrypi" | 42 | SOTA_MACHINE_rpi ?= "raspberrypi" |
