From 0c13f3ed8d1f16073aad440b1f5c21f3f725d865 Mon Sep 17 00:00:00 2001 From: Otto Bittner Date: Fri, 26 May 2023 10:15:30 +0200 Subject: [PATCH] image: add aws_aws-sev-snp variant This needs no changes to the existing AWS image. The images have worked without modification so far. --- .github/workflows/build-os-image.yml | 6 ++++++ image/Makefile | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-os-image.yml b/.github/workflows/build-os-image.yml index ea5dd7c0b..dfdf1ef9d 100644 --- a/.github/workflows/build-os-image.yml +++ b/.github/workflows/build-os-image.yml @@ -263,6 +263,8 @@ jobs: include: - csp: aws attestation_variant: aws-nitro-tpm + - csp: aws + attestation_variant: aws-sev-snp - csp: azure attestation_variant: azure-sev-snp - csp: gcp @@ -384,6 +386,8 @@ jobs: include: - csp: aws attestation_variant: aws-nitro-tpm + - csp: aws + attestation_variant: aws-sev-snp - csp: azure attestation_variant: azure-sev-snp - csp: gcp @@ -545,6 +549,8 @@ jobs: include: - csp: aws attestation_variant: aws-nitro-tpm + - csp: aws + attestation_variant: aws-sev-snp - csp: azure attestation_variant: azure-sev-snp - csp: gcp diff --git a/image/Makefile b/image/Makefile index 389f8a2ab..e14ccebb7 100644 --- a/image/Makefile +++ b/image/Makefile @@ -19,7 +19,7 @@ export INSTALL_DEBUGD ?= $(DEBUG) export CONSOLE_MOTD = $(AUTOLOGIN) -include $(CURDIR)/config.mk csps := aws azure gcp openstack qemu -variants := aws_aws-nitro-tpm azure_azure-sev-snp gcp_gcp-sev-es gcp_gcp-sev-snp openstack_qemu-vtpm qemu_qemu-vtpm +variants := aws_aws-sev-snp aws_aws-nitro-tpm azure_azure-sev-snp gcp_gcp-sev-es gcp_gcp-sev-snp openstack_qemu-vtpm qemu_qemu-vtpm certs := $(PKI)/PK.cer $(PKI)/KEK.cer $(PKI)/db.cer SYSTEMD_FIXED_RPMS := systemd-251.11-2.fc37.x86_64.rpm systemd-libs-251.11-2.fc37.x86_64.rpm systemd-networkd-251.11-2.fc37.x86_64.rpm systemd-pam-251.11-2.fc37.x86_64.rpm systemd-resolved-251.11-2.fc37.x86_64.rpm systemd-udev-251.11-2.fc37.x86_64.rpm