From a73f19acb0aa3f14be3ac037f085dd8a9f40b48f Mon Sep 17 00:00:00 2001 From: Jan Mussler Date: Wed, 21 Dec 2022 14:09:00 +0100 Subject: [PATCH 1/5] Update stups_auto_configuration.py Remove the actual check for Taupage Image. Keep key setup in place. --- senza/components/stups_auto_configuration.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/senza/components/stups_auto_configuration.py b/senza/components/stups_auto_configuration.py index 278c9570..46bbfd5e 100644 --- a/senza/components/stups_auto_configuration.py +++ b/senza/components/stups_auto_configuration.py @@ -5,15 +5,7 @@ def component_stups_auto_configuration(definition, configuration, args, info, force, account_info): - for channel in taupage.CHANNELS.values(): - most_recent_image = taupage.find_image(args.region, channel) - if most_recent_image: - configuration = ensure_keys(configuration, "Images", channel.image_mapping, args.region) - configuration["Images"][channel.image_mapping][args.region] = most_recent_image.id - elif channel == taupage.DEFAULT_CHANNEL: - # Require at least one image from the stable channel - raise Exception('No Taupage AMI found') - + configuration = ensure_keys(configuration, "Images", channel.image_mapping, args.region) component_subnet_auto_configuration(definition, configuration, args, info, force, account_info) return definition From 44c34fa5f2c31119f1e8bab8bdec5abbf7113aa5 Mon Sep 17 00:00:00 2001 From: Jan Mussler Date: Wed, 21 Dec 2022 14:11:33 +0100 Subject: [PATCH 2/5] Update stups_auto_configuration.py Reference default channel --- senza/components/stups_auto_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/senza/components/stups_auto_configuration.py b/senza/components/stups_auto_configuration.py index 46bbfd5e..37c83775 100644 --- a/senza/components/stups_auto_configuration.py +++ b/senza/components/stups_auto_configuration.py @@ -5,7 +5,7 @@ def component_stups_auto_configuration(definition, configuration, args, info, force, account_info): - configuration = ensure_keys(configuration, "Images", channel.image_mapping, args.region) + configuration = ensure_keys(configuration, "Images", taupage.DEFAULT_CHANNEL.image_mapping, args.region) component_subnet_auto_configuration(definition, configuration, args, info, force, account_info) return definition From 853600980079fb7ba9b6812c75be31a687794211 Mon Sep 17 00:00:00 2001 From: Jan Mussler Date: Thu, 22 Dec 2022 11:50:40 +0100 Subject: [PATCH 3/5] Update delivery.yaml --- delivery.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/delivery.yaml b/delivery.yaml index c70886b6..cded519c 100644 --- a/delivery.yaml +++ b/delivery.yaml @@ -6,7 +6,9 @@ notifications: pipeline: - id: build type: script - overlay: ci/python + vm_config: + type: linux + image: cdp-runtime/python commands: - desc: "Install dependencies" cmd: pip install -r requirements.txt From 54c218e39383aeba809ae63cf085bb153f92e07d Mon Sep 17 00:00:00 2001 From: Jan Mussler Date: Thu, 22 Dec 2022 12:10:28 +0100 Subject: [PATCH 4/5] Update delivery.yaml --- delivery.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/delivery.yaml b/delivery.yaml index cded519c..c0ab0b39 100644 --- a/delivery.yaml +++ b/delivery.yaml @@ -8,7 +8,7 @@ pipeline: type: script vm_config: type: linux - image: cdp-runtime/python + image: cdp-runtime/python-3.7 commands: - desc: "Install dependencies" cmd: pip install -r requirements.txt From 890a5b6faa4b39170bd6c97e86f928a0f86b583e Mon Sep 17 00:00:00 2001 From: Jan Mussler Date: Thu, 22 Dec 2022 12:30:30 +0100 Subject: [PATCH 5/5] Update delivery.yaml --- delivery.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/delivery.yaml b/delivery.yaml index c0ab0b39..2d8d345e 100644 --- a/delivery.yaml +++ b/delivery.yaml @@ -8,7 +8,7 @@ pipeline: type: script vm_config: type: linux - image: cdp-runtime/python-3.7 + image: cdp-runtime/python-3.6 commands: - desc: "Install dependencies" cmd: pip install -r requirements.txt