From 03cdfb5bd9f9483d2762d6371ed59e9da66a08b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Mon, 3 Aug 2020 18:16:17 +0200 Subject: [PATCH 1/2] Revert "Build app-emulation/amazon-ssm-agent with EC2 AMI images" This reverts commit 58c8b0dc393ce08047f7a4f530ed5da9aa205799. --- .../oem-ec2-compat/files/base/base-ec2.ign | 25 ------------------- .../oem-ec2-compat-0.1.2.ebuild | 4 --- 2 files changed, 29 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign index dd5ce9670a..bfcfd84e05 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign @@ -7,31 +7,6 @@ { "name": "coreos-metadata-sshkeys@.service", "enabled": true - }, - { - "name": "amazon-ssm-agent.service", - "enabled": true, - "contents": "[Unit]\nDescription=amazon-ssm-agent\nAfter=network-online.target\n\n[Service]\nType=simple\nWorkingDirectory=/usr/share/oem\nExecStart=/usr/share/oem/amazon-ssm-agent\nKillMode=process\nRestart=on-failure\nRestartForceExitStatus=SIGPIPE\nRestartSec=15min\n\n[Install]\nWantedBy=multi-user.target\n" - } - ] - }, - "storage": { - "files": [ - { - "filesystem": "root", - "path": "/etc/amazon/ssm/amazon-ssm-agent.json", - "contents": { - "source": "oem:///ssm/amazon-ssm-agent.json.template" - }, - "mode": 292 - }, - { - "filesystem": "root", - "path": "/etc/amazon/ssm/seelog.xml", - "contents": { - "source": "oem:///ssm/seelog.xml.template" - }, - "mode": 292 } ] } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild index 6c48367530..acd897e6db 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild @@ -13,10 +13,6 @@ KEYWORDS="amd64 arm64 x86" IUSE="ec2 openstack brightbox" REQUIRED_USE="^^ ( ec2 openstack brightbox )" -RDEPEND=" - app-emulation/amazon-ssm-agent -" - # no source directory S="${WORKDIR}" From 4d826abf4128b36ff83e4ac55865ed78cd1e04f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Mon, 3 Aug 2020 12:22:11 +0200 Subject: [PATCH 2/2] Build amazon-ssm-agent package but disable it for now The amazon-ssm-agent package was never built and caused the vm-matrix job to find no binary package. Build it as part of build_packages but don't install it on openstack or brightbox images. The plan is to add it for EC2 but currently the binaries are too large. --- .../coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild | 7 +++++++ .../board-packages/board-packages-0.0.1.ebuild | 1 + 2 files changed, 8 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild index acd897e6db..563685c3cc 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild @@ -13,6 +13,13 @@ KEYWORDS="amd64 arm64 x86" IUSE="ec2 openstack brightbox" REQUIRED_USE="^^ ( ec2 openstack brightbox )" +# TODO: The AWS SSM Agent is currently too big for the OEM partition +# but if it fits, uncomment the following and revert +# b6abb59c544be13e923a3e7240b5c9395c281fca +#RDEPEND=" +# ec2? ( app-emulation/amazon-ssm-agent ) +#" + # no source directory S="${WORKDIR}" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild index 8972565484..de038c4d2a 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild @@ -31,6 +31,7 @@ RDEPEND=" sys-boot/grub sys-firmware/edk2-ovmf ) + app-emulation/amazon-ssm-agent coreos-base/coreos coreos-base/coreos-dev "