From 7f13329c6a48b64c249af7be26a30b68032c5d4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 18 May 2023 12:49:31 +0200 Subject: [PATCH] Revert "versions: Update QEMU TDX version" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3018c9ad517874779a0017ab38a9796ab1c79da9. 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 --- .../no_patches.txt | 0 tools/packaging/scripts/configure-hypervisor.sh | 1 - versions.yaml | 5 ++--- 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 tools/packaging/qemu/patches/tag_patches/ad4c7f529a279685da84297773b4ec8080153c2d-plus-TDX-v1.3/no_patches.txt diff --git a/tools/packaging/qemu/patches/tag_patches/ad4c7f529a279685da84297773b4ec8080153c2d-plus-TDX-v1.3/no_patches.txt b/tools/packaging/qemu/patches/tag_patches/ad4c7f529a279685da84297773b4ec8080153c2d-plus-TDX-v1.3/no_patches.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tools/packaging/scripts/configure-hypervisor.sh b/tools/packaging/scripts/configure-hypervisor.sh index 751b2866f9..495251e4c1 100755 --- a/tools/packaging/scripts/configure-hypervisor.sh +++ b/tools/packaging/scripts/configure-hypervisor.sh @@ -247,7 +247,6 @@ generate_qemu_options() { else qemu_options+=(size:--disable-png) fi - qemu_options+=(size:--disable-vnc-sasl) # Disable PAM authentication: it's a feature used together with VNC access diff --git a/versions.yaml b/versions.yaml index 824152e1be..37c04b127a 100644 --- a/versions.yaml +++ b/versions.yaml @@ -109,10 +109,9 @@ assets: version: "7a800cf9496fddddf71b21a00991e0ec757a170a" qemu-tdx-experimental: - # yamllint disable-line rule:line-length - description: "QEMU with TDX support - based on https://github.com/intel/tdx-tools/releases/tag/2023ww01" + description: "VMM that uses KVM and supports TDX" url: "https://github.com/kata-containers/qemu" - tag: "ad4c7f529a279685da84297773b4ec8080153c2d-plus-TDX-v1.3" + tag: "TDX-v3.1" image: description: |