From ff48572bb9e344ca746c924740b902dfba0e47ed Mon Sep 17 00:00:00 2001
From: Romain Gayon <romaing@google.com>
Date: Mon, 24 Jun 2024 16:02:14 +0200
Subject: [PATCH 1/4] add debug

---
 config/jenkins/e2e.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/jenkins/e2e.sh b/config/jenkins/e2e.sh
index e8db665..1ceed4b 100644
--- a/config/jenkins/e2e.sh
+++ b/config/jenkins/e2e.sh
@@ -81,7 +81,7 @@ function setup {
   if [ ! -f "${EVIDENCE_DISK}" ]; then
     evidence_disk_url=$(normalize_gcs_url "${EVIDENCE_DISK_GSURL}")
     msg "Downloading evidence disk from ${evidence_disk_url}"
-    gsutil -q cp "${evidence_disk_url}" "${EVIDENCE_DISK}"
+    gsutil -DD cp "${evidence_disk_url}" "${EVIDENCE_DISK}"
   fi
 
 }

From 79690763699bdd0888944ab7eb3f9a2690874d87 Mon Sep 17 00:00:00 2001
From: Romain Gayon <romaing@google.com>
Date: Mon, 24 Jun 2024 16:14:16 +0200
Subject: [PATCH 2/4] setup SA

---
 config/jenkins/e2e.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/jenkins/e2e.sh b/config/jenkins/e2e.sh
index 1ceed4b..fd4862e 100644
--- a/config/jenkins/e2e.sh
+++ b/config/jenkins/e2e.sh
@@ -269,6 +269,8 @@ function main {
   fi
   ISO_FILENAME="${ISO_TO_REMASTER_URL##*/}"
 
+  gcloud auth activate-service-account --key-file "${SA_CREDENTIALS_FILE}"
+
   msg "Setting up environment"
   setup
   msg "Starting GiftStick image building process"

From aa99f4576d33680ba8785d8ca009fac507510449 Mon Sep 17 00:00:00 2001
From: Romain Gayon <romaing@google.com>
Date: Mon, 24 Jun 2024 16:29:59 +0200
Subject: [PATCH 3/4] replace -no-kvm with -machine accel=tcg

---
 config/jenkins/e2e.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/jenkins/e2e.sh b/config/jenkins/e2e.sh
index fd4862e..6898f17 100644
--- a/config/jenkins/e2e.sh
+++ b/config/jenkins/e2e.sh
@@ -136,7 +136,7 @@ function run_image {
   qemu-system-x86_64 -cpu qemu64 -bios /usr/share/ovmf/OVMF.fd  -m 1024 \
     -drive format=raw,file="${IMAGE_NAME}" -device e1000,netdev=net0 \
     -drive format=raw,file="${EVIDENCE_DISK}" \
-    -netdev user,id=net0,hostfwd=tcp::${QEMU_SSH_PORT}-:22 -no-kvm -daemonize -display none
+    -netdev user,id=net0,hostfwd=tcp::${QEMU_SSH_PORT}-:22 -machine accel=tcg -daemonize -display none
 
   # Cloud VMs lack any kind of virtualization super powers, so booting a
   # Ubuntu VM in a vm can take around forever.

From dbd0533ef1e04e63bce8f88fe9cfb0b547b14c23 Mon Sep 17 00:00:00 2001
From: Romain Gayon <romaing@google.com>
Date: Tue, 25 Jun 2024 13:17:32 +0200
Subject: [PATCH 4/4] revert DD

---
 config/jenkins/e2e.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/jenkins/e2e.sh b/config/jenkins/e2e.sh
index 6898f17..c7a3c7c 100644
--- a/config/jenkins/e2e.sh
+++ b/config/jenkins/e2e.sh
@@ -81,7 +81,7 @@ function setup {
   if [ ! -f "${EVIDENCE_DISK}" ]; then
     evidence_disk_url=$(normalize_gcs_url "${EVIDENCE_DISK_GSURL}")
     msg "Downloading evidence disk from ${evidence_disk_url}"
-    gsutil -DD cp "${evidence_disk_url}" "${EVIDENCE_DISK}"
+    gsutil -q cp "${evidence_disk_url}" "${EVIDENCE_DISK}"
   fi
 
 }