From 3eabc4c707b9e3c03d5ee7f8bd600a7ae660baed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Mon, 29 May 2023 18:26:08 +0200
Subject: [PATCH] ci: Use virtme-ng

virtme is now deprecated, so let's use the new generation one.

Also we don't require anymore pyelftools but we do need argcomplete

Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2821
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3029>
---
 .gitlab-ci.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0dc768363..6c733a6a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,7 +69,7 @@ variables:
     - .skip-git-clone
   variables:
     FDO_DISTRIBUTION_VERSION: 38
-    BASE_TAG: '2023-05-29.0'
+    BASE_TAG: '2023-05-29.2'
     FDO_USER: 'meta-user'
     FDO_DISTRIBUTION_PACKAGES:
       asciidoc
@@ -138,14 +138,15 @@ variables:
         mkdir -p /opt/mutter
         cp build/src/tests/kvm/bzImage /opt/mutter/bzImage
 
-        dnf install -y python3-pyelftools
+        dnf install -y python3-argcomplete
 
-        git clone https://github.com/arighi/virtme.git
-        cd virtme
-        git checkout aa99f43bd44c84dc95911ce99a8281cea5dfc5a1
+        git clone https://github.com/arighi/virtme-ng.git
+        cd virtme-ng
+        git fetch --tags
+        git checkout upstream/1.8
         ./setup.py install --prefix=/usr
         cd ..
-        rm -rf virtme
+        rm -rf virtme-ng
         rm -rf build mutter-src
       fi
   retry: