diff options
| author | Sayan Chowdhury <sayan.chowdhury2012@gmail.com> | 2017-05-31 16:31:37 +0530 |
|---|---|---|
| committer | Sayan Chowdhury <sayanchowdhury@fedoraproject.org> | 2017-06-01 07:07:05 +0000 |
| commit | 88912f2ec99d8bafc516b248ac4a65e4c4b013ff (patch) | |
| tree | cab38735bc13640db1f7c0a9749e85ec70243c85 | |
| parent | 049effe2e2e2ccf3ae83381bcfa0bdc4c855f912 (diff) | |
| download | ansible-88912f2ec99d8bafc516b248ac4a65e4c4b013ff.tar.gz ansible-88912f2ec99d8bafc516b248ac4a65e4c4b013ff.tar.xz ansible-88912f2ec99d8bafc516b248ac4a65e4c4b013ff.zip | |
Revert "Hotfix for the Autocloud fix"
This reverts commit 78051dc038373fc0e5608ff215c19296ee90d343.
| -rw-r--r-- | files/hotfix/autocloud/__init__.py | 2 | ||||
| -rw-r--r-- | files/hotfix/autocloud/consumer.py | 6 | ||||
| -rw-r--r-- | files/hotfix/autocloud/models.py | 3 |
3 files changed, 2 insertions, 9 deletions
diff --git a/files/hotfix/autocloud/__init__.py b/files/hotfix/autocloud/__init__.py index 77cb9147a..84d100516 100644 --- a/files/hotfix/autocloud/__init__.py +++ b/files/hotfix/autocloud/__init__.py @@ -27,7 +27,7 @@ def produce_jobs(infox): session = init_model() timestamp = datetime.datetime.now() for info in infox: - image_name = info['path'].split('/')[-1].split(info['arch'])[0] + image_name = info['path'].split('.x86_64')[0].split('/')[-1] jd = ComposeJobDetails( arch=info['arch'], compose_id=info['compose']['id'], diff --git a/files/hotfix/autocloud/consumer.py b/files/hotfix/autocloud/consumer.py index 99b8b6580..1147b769c 100644 --- a/files/hotfix/autocloud/consumer.py +++ b/files/hotfix/autocloud/consumer.py @@ -78,12 +78,6 @@ class AutoCloudConsumer(fedmsg.consumers.FedmsgConsumer): for variant in compose_images_variants: compose_image = compose_images[variant] for arch, payload in compose_image.iteritems(): - - # aarch64 is not supported so filter if the arch is - # 'aarch64' - if arch == 'aarch64': - continue - for item in payload: relative_path = item['path'] if not is_valid_image(relative_path): diff --git a/files/hotfix/autocloud/models.py b/files/hotfix/autocloud/models.py index 43f75f6f8..4a6f35f5a 100644 --- a/files/hotfix/autocloud/models.py +++ b/files/hotfix/autocloud/models.py @@ -86,8 +86,7 @@ class ComposeJobDetails(Base): ARCH_TYPES = ( ('i386', 'i386'), - ('x86_64', 'x86_64'), - ('aarch64', 'aarch64') + ('x86_64', 'x86_64') ) id = Column(Integer, primary_key=True) |