From c29e5036a68f67c556750356e43f7bf88b0fe313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 18 May 2023 12:49:42 +0200 Subject: [PATCH] Revert "versions: Move QEMU TDX to its own experimental entry" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 800ee5cd8868f7d59e14c481df814fb405cd2164. 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 --- versions.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/versions.yaml b/versions.yaml index 37c04b127a..ebac758eb5 100644 --- a/versions.yaml +++ b/versions.yaml @@ -98,6 +98,10 @@ assets: uscan-url: >- https://github.com/qemu/qemu/tags .*/v?(\d\S+)\.tar\.gz + tdx: + description: "VMM that uses KVM and supports TDX" + url: "https://github.com/kata-containers/qemu" + tag: "TDX-v3.1" snp: description: "VMM that uses KVM and supports AMD SEV-SNP" url: "https://github.com/AMDESE/qemu" @@ -108,11 +112,6 @@ assets: url: "https://github.com/qemu/qemu" version: "7a800cf9496fddddf71b21a00991e0ec757a170a" - qemu-tdx-experimental: - description: "VMM that uses KVM and supports TDX" - url: "https://github.com/kata-containers/qemu" - tag: "TDX-v3.1" - image: description: | Root filesystem disk image used to boot the guest virtual