Revert "versions: Update Kernel TDX version"

This reverts commit f33345c311.

As the Jenkins TDX CI is running on a system with a TDX stack called
"2022ww44", we should keep the QEMU / kernel / OVMF versions matching
what's provided in that stack.

The reason we were able to update this on `main` is because the GHA TDX
CI is running on a TDX stack called "2023ww01", but we have decided to
NOT take the bullet, NOT updating the Jenkins CI in order to avoid
unexepected breakages.

This regression was introduced as part of the last CCv0 merge to main,
and would've been caught by the CI, and should've been caught by the
reviewer (myself :-)), but CI was having a hard time to even build the
compoenents and I wrote in the PR and I'm quoting it here: "I rather
deal with possible breakages on this later on, than block this PR to get
in." ... and here we are. :-)

Fixes: #6884

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio 2023-05-18 12:49:03 +02:00
parent 82e6b65f63
commit 4bdf56a3f8
4 changed files with 7 additions and 4 deletions

View File

@ -5,9 +5,13 @@ CONFIG_DMA_RESTRICTED_POOL=y
CONFIG_EFI=y CONFIG_EFI=y
CONFIG_EFI_STUB=y CONFIG_EFI_STUB=y
CONFIG_INTEL_IOMMU_SVM=y CONFIG_INTEL_IOMMU_SVM=y
CONFIG_INTEL_TDX_ATTESTATION=y
CONFIG_INTEL_TDX_FIXES=y
CONFIG_INTEL_TDX_GUEST=y CONFIG_INTEL_TDX_GUEST=y
CONFIG_OF=y CONFIG_OF=y
CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESERVED_MEM=y
CONFIG_X86_5LEVEL=y CONFIG_X86_5LEVEL=y
CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
CONFIG_X86_MEM_ENCRYPT_COMMON=y
CONFIG_X86_PLATFORM_DEVICES=y CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_X86_PLATFORM_DRIVERS_INTEL=y

View File

@ -1 +1 @@
105cc 106cc

View File

@ -183,10 +183,9 @@ assets:
version: "v5.10.25" version: "v5.10.25"
kernel-tdx-experimental: kernel-tdx-experimental:
# yamllint disable-line rule:line-length description: "Linux kernel that supports TDX"
description: "Linux kernel with TDX support -- based on https://github.com/intel/tdx-tools/releases/tag/2023ww01"
url: "https://github.com/kata-containers/linux/archive/refs/tags" url: "https://github.com/kata-containers/linux/archive/refs/tags"
version: "5.19-TDX-v2.2" tag: "5.15-plus-TDX"
externals: externals:
description: "Third-party projects used by the system" description: "Third-party projects used by the system"