diff options
Diffstat (limited to 'classes/image_types_ostree.bbclass')
-rw-r--r-- | classes/image_types_ostree.bbclass | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 2e8e8f5..fd67865 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -237,10 +237,18 @@ IMAGE_CMD_garagesign () { | |||
237 | # Push may fail due to race condition when multiple build machines try to push simultaneously | 237 | # Push may fail due to race condition when multiple build machines try to push simultaneously |
238 | # in which case targets.json should be pulled again and the whole procedure repeated | 238 | # in which case targets.json should be pulled again and the whole procedure repeated |
239 | push_success=0 | 239 | push_success=0 |
240 | target_url="" | 240 | target_url="" |
241 | if [ -n "${GARAGE_TARGET_URL}" ]; then | 241 | if [ -n "${GARAGE_TARGET_URL}" ]; then |
242 | target_url='--url ${GARAGE_TARGET_URL}' | 242 | target_url="--url ${GARAGE_TARGET_URL}" |
243 | fi | 243 | fi |
244 | target_expiry="" | ||
245 | if [ -n "${GARAGE_TARGET_EXPIRES}" ] && [ -n "${GARAGE_TARGET_EXPIRE_AFTER}" ]; then | ||
246 | bbfatal "Both GARAGE_TARGET_EXPIRES and GARAGE_TARGET_EXPIRE_AFTER are set. Only one can be set at a time." | ||
247 | elif [ -n "${GARAGE_TARGET_EXPIRES}" ]; then | ||
248 | target_expiry="--expires ${GARAGE_TARGET_EXPIRES}" | ||
249 | elif [ -n "${GARAGE_TARGET_EXPIRE_AFTER}" ]; then | ||
250 | target_expiry="--expire-after ${GARAGE_TARGET_EXPIRE_AFTER}" | ||
251 | fi | ||
244 | 252 | ||
245 | for push_retries in $( seq 3 ); do | 253 | for push_retries in $( seq 3 ); do |
246 | garage-sign targets pull --repo tufrepo \ | 254 | garage-sign targets pull --repo tufrepo \ |
@@ -262,6 +270,7 @@ IMAGE_CMD_garagesign () { | |||
262 | fi | 270 | fi |
263 | garage-sign targets sign --repo tufrepo \ | 271 | garage-sign targets sign --repo tufrepo \ |
264 | --home-dir ${GARAGE_SIGN_REPO} \ | 272 | --home-dir ${GARAGE_SIGN_REPO} \ |
273 | ${target_expiry} \ | ||
265 | --key-name=targets | 274 | --key-name=targets |
266 | errcode=0 | 275 | errcode=0 |
267 | garage-sign targets push --repo tufrepo \ | 276 | garage-sign targets push --repo tufrepo \ |