Hi,
fedimg contains a trigger upload script that helps in uploading the raw images in case the upload fails. This patch fixes the script to use the third parameter in the function that would push the compose metadata.
+1s?
From: Sayan Chowdhury sayan.chowdhury2012@gmail.com Date: Tue, 13 Mar 2018 17:07:53 +0530 Subject: [PATCH 1/1] fedimg: Fix the trigger_upload script to create AMIs manually
--- roles/fedimg/files/trigger_upload.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/roles/fedimg/files/trigger_upload.py b/roles/fedimg/files/trigger_upload.py index 5a5208d..29907f1 100644 --- a/roles/fedimg/files/trigger_upload.py +++ b/roles/fedimg/files/trigger_upload.py @@ -16,7 +16,7 @@ from fedimg.services.ec2 import EC2Service, EC2ServiceException import fedimg.uploader from fedimg.util import virt_types_from_url
-if len(sys.argv) != 2: +if len(sys.argv) != 3: print 'Usage: trigger_upload.py <rawxz_image_url>' sys.exit(1)
@@ -26,5 +26,10 @@ log = logging.getLogger('fedmsg') upload_pool = multiprocessing.pool.ThreadPool(processes=4)
url = sys.argv[1] +compose_id = sys.argv[2]
-fedimg.uploader.upload(upload_pool, [url]) +compose_meta = { + 'compose_id': compose_id +} + +fedimg.uploader.upload(upload_pool, [url], compose_meta=compose_meta)