From 04b1ba52f9e990f53d192c60e79414247331bea2 Mon Sep 17 00:00:00 2001
From: Markus Frosch <markus.frosch@icinga.com>
Date: Fri, 8 Feb 2019 14:16:49 +0100
Subject: [PATCH] upload: Better defaults for architectures in Debian
---
icinga-build-upload-aptly | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/icinga-build-upload-aptly b/icinga-build-upload-aptly
index 9097e94..a49b491 100755
--- a/icinga-build-upload-aptly
+++ b/icinga-build-upload-aptly
@@ -95,6 +95,7 @@ parser.add_argument('--release', metavar='release', required=True,
parser.add_argument('--repo', metavar='repo',
help='Specific repository name in aptly')
parser.add_argument('--architectures', metavar='list',
+ default=os.environ.get('ICINGA_BUILD_DEB_DEFAULT_ARCH', 'amd64'),
help=('Specify list of architectures to publish the repo with,'
'separated by comma (e.g. amd64,i386 or armhf)'))
parser.add_argument('--insecure', action='store_true', help='Disable SSL verification')
@@ -143,6 +144,10 @@ if args.repo:
if args.architectures:
upload_meta['architectures'] = re.split(r'\s*,\s*', args.architectures)
+ # always add i386 if amd64 is base arch
+ if 'amd64' in upload_meta['architectures'] and not 'i386' in upload_meta['architectures']:
+ upload_meta['architectures'].append('i386')
+
# uploading files
upload_url = aptly_url('/files/' + upload_name)
print "Uploading %d files to %s" % (len(files), upload_name)
--
GitLab