From 178b27ed805432319621434b59a3c7e7bc8b410f Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <ivan@espressif.com>
Date: Tue, 28 Nov 2023 19:16:31 +0100
Subject: [PATCH] ci(qemu): use qemu from tools.json, don't require a special
 image

---
 .gitlab/ci/common.yml    | 1 -
 .gitlab/ci/host-test.yml | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab/ci/common.yml b/.gitlab/ci/common.yml
index 7647bdf0c1..d51ca7866c 100644
--- a/.gitlab/ci/common.yml
+++ b/.gitlab/ci/common.yml
@@ -51,7 +51,6 @@ variables:
   # Docker images
   ESP_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-env-v5.3:1"
   ESP_IDF_DOC_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-doc-env-v5.3:1-1"
-  QEMU_IMAGE: "${CI_DOCKER_REGISTRY}/qemu-v5.3:1-20230522"
   TARGET_TEST_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/target-test-env-v5.3:1"
   SONARQUBE_SCANNER_IMAGE: "${CI_DOCKER_REGISTRY}/sonarqube-scanner:5"
   PRE_COMMIT_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-pre-commit:1"
diff --git a/.gitlab/ci/host-test.yml b/.gitlab/ci/host-test.yml
index 303d09da2f..ec6988e314 100644
--- a/.gitlab/ci/host-test.yml
+++ b/.gitlab/ci/host-test.yml
@@ -281,7 +281,6 @@ test_pytest_qemu:
   extends:
     - .host_test_template
     - .before_script:build
-  image: $QEMU_IMAGE
   artifacts:
     when: always
     paths:
@@ -294,6 +293,8 @@ test_pytest_qemu:
   parallel:
     matrix:
       - IDF_TARGET: [esp32, esp32c3]
+  variables:
+    INSTALL_QEMU: 1
   script:
     - run_cmd python tools/ci/ci_build_apps.py . -vv
       --target $IDF_TARGET