Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Revert "Hotfix for the Autocloud fix"

Browse source 
This reverts commit 78051dc038.
This commit is contained in:
Sayan Chowdhury 2017-05-31 16:31:37 +05:30 • committed by Sayan Chowdhury
parent 049effe2e2
commit 88912f2ec9
3 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
files/hotfix/autocloud/__init__.py
View file

@ -27,7 +27,7 @@ def produce_jobs(infox):
session = init_model() session = init_model()
timestamp = datetime.datetime.now() timestamp = datetime.datetime.now()
for info in infox: 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( jd = ComposeJobDetails(
arch=info['arch'], arch=info['arch'],
compose_id=info['compose']['id'], compose_id=info['compose']['id'],

6
files/hotfix/autocloud/consumer.py
View file

@ -78,12 +78,6 @@ class AutoCloudConsumer(fedmsg.consumers.FedmsgConsumer):
for variant in compose_images_variants: for variant in compose_images_variants:
compose_image = compose_images[variant] compose_image = compose_images[variant]
for arch, payload in compose_image.iteritems(): 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: for item in payload:
relative_path = item['path'] relative_path = item['path']
if not is_valid_image(relative_path): if not is_valid_image(relative_path):

3
files/hotfix/autocloud/models.py
View file

@ -86,8 +86,7 @@ class ComposeJobDetails(Base):
ARCH_TYPES = ( ARCH_TYPES = (
('i386', 'i386'), ('i386', 'i386'),
('x86_64', 'x86_64'), ('x86_64', 'x86_64')
('aarch64', 'aarch64')
) )
id = Column(Integer, primary_key=True) id = Column(Integer, primary_key=True)