Skip to content

Commit 50ef627

Browse files
JackThomson2roypat
authored andcommitted
ci: Use AL23 for secret hiding CI
Move from Ubuntu to AL2023 for the secret hiding testing to bring it inline with the other kernels We had to add some more kernel config overrides. The amazon linux default kernel didn't have CRYPTO_HW enabled, this is required as a dependency for AMD_SEV. Signed-off-by: Jack Thomson <jackabt@amazon.com>
1 parent dc53e8d commit 50ef627

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

.buildkite/common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
DEFAULT_PLATFORMS = [
3434
("al2", "linux_5.10"),
3535
("al2023", "linux_6.1"),
36-
("ubuntu24", "secret_hiding"),
36+
("al2023", "secret_hiding"),
3737
]
3838

3939

resources/hiding_ci/build_and_install_kernel.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,15 +177,15 @@ make olddefconfig
177177
scripts/config --disable SYSTEM_TRUSTED_KEYS
178178
scripts/config --disable SYSTEM_REVOCATION_KEYS
179179

180-
# We run this again to default options now changed by
181-
# the disabling of the ubuntu keys
182-
make olddefconfig
183-
184180
# Apply our config overrides on top of the config
185181
scripts/kconfig/merge_config.sh -m .config $KERNEL_CONFIG_OVERRIDES
186182

187183
check_override_presence
188184

185+
# We run this again to default options now changed by
186+
# the disabling of the ubuntu keys
187+
make olddefconfig
188+
189189
echo "Building kernel this may take a while"
190190
make -s -j $(nproc)
191191
echo "Building kernel modules"
Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
CONFIG_EXPERT=y
2+
CONFIG_CRYPTO_HW=y
3+
CONFIG_CRYPTO_DEV_CCP=y
4+
CONFIG_CRYPTO_DEV_CCP_DD=y
5+
CONFIG_CRYPTO_DEV_SP_PSP=y
26
CONFIG_KVM=y
37
CONFIG_KVM_SW_PROTECTED_VM=y
4-
CONFIG_KVM_PRIVATE_MEM=y
8+
CONFIG_KVM_AMD=y
9+
CONFIG_KVM_INTEL=y
510
CONFIG_KVM_AMD_SEV=y
11+
CONFIG_KVM_PRIVATE_MEM=y
12+
CONFIG_KVM_GENERIC_MMU_NOTIFIER=y
13+
CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
14+
CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES=y
15+
CONFIG_KVM_GENERIC_PRIVATE_MEM=y
616
CONFIG_DEBUG_INFO=y

0 commit comments

Comments
 (0)