From 8c12dedf057fad0be413ee489d0a26e8fe2e450a Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Wed, 8 May 2024 09:15:23 +0000
Subject: [PATCH] Fix amazon linux bootstrap (#11139)
c58497cde (Refactor bootstrap-os (#10983), 2024-03-27) refactored the
boostrap-os include but didn't adapt the amazon linux tasks to the
actual ID of amazon linux ('amzn')
Re-enable the CI so we can avoid that kind of breakage.
---
.gitlab-ci/packet.yml | 10 +++++-----
roles/bootstrap-os/tasks/{amazon.yml => amzn.yml} | 0
2 files changed, 5 insertions(+), 5 deletions(-)
rename roles/bootstrap-os/tasks/{amazon.yml => amzn.yml} (100%)
diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
index de61a1f60..5b23eb9b8 100644
--- a/.gitlab-ci/packet.yml
+++ b/.gitlab-ci/packet.yml
@@ -174,6 +174,11 @@ packet_almalinux8-docker:
extends: .packet_pr
when: on_success
+packet_amazon-linux-2-all-in-one:
+ stage: deploy-part2
+ extends: .packet_pr
+ when: on_success
+
packet_fedora38-docker-weave:
stage: deploy-part2
extends: .packet_pr
@@ -240,11 +245,6 @@ packet_fedora37-calico-swap-selinux:
extends: .packet_pr
when: manual
-packet_amazon-linux-2-all-in-one:
- stage: deploy-part2
- extends: .packet_pr
- when: manual
-
packet_almalinux8-calico-nodelocaldns-secondary:
stage: deploy-part2
extends: .packet_pr
diff --git a/roles/bootstrap-os/tasks/amazon.yml b/roles/bootstrap-os/tasks/amzn.yml
similarity index 100%
rename from roles/bootstrap-os/tasks/amazon.yml
rename to roles/bootstrap-os/tasks/amzn.yml
--
GitLab