From b095a1c2af9de70a4665cfcb4132be34f77fb289 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 10 Dec 2025 09:11:28 -0300
Subject: [PATCH] CI: Remove kvm skipped job

We didn't notice that the KVM tests didn't run and enabling the KVM jobs with env variable doesn't work anymore, because even merge requests against our project don't have access to our KVM runners. So the better option is to fail explicitly, so we can run the MR pipeline with our runners manually.
---
 .gitlab-ci.yml | 33 +++------------------------------
 1 file changed, 3 insertions(+), 30 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 838931f04..fbae2602e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ workflow:
   before_script:
     - echo "org.gradle.caching=true" >> gradle.properties
     - test -e /etc/apt/sources.list.d/bookworm-backports.list
-        || echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/sources.list
+      || echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/sources.list
     - apt update
     - apt-get -qy install -t bookworm-backports --no-install-recommends git sdkmanager openjdk-17-jdk-headless
 
@@ -311,37 +311,10 @@ libs database schema:
   allow_failure:
     exit_codes: 137
 
-# Since jobs that require KVM need special runners, these jobs are
-# opt-in.  To set up your fork to run KVM jobs, go to Settings ->
-# CI/CD -> Variables, and add a variable called RUN_KVM_JOBS with a
-# value of "1".  For example, this is for the canonical repo:
-#
-# https://gitlab.com/fdroid/fdroidclient/-/settings/ci_cd#js-cicd-variables-settings
-.kvm-template: &kvm-template
-  tags:
-    - fdroid
-    - kvm
-  rules:
-    - if: $RUN_KVM_JOBS
+kvm 24 default x86:
   <<: *test-template
   <<: *kvm-connected-template
 
-
-kvm jobs skipped:
-  rules:
-    - if: '$RUN_KVM_JOBS == null || $RUN_KVM_JOBS == "" || $RUN_KVM_JOBS == "0"'
-  image: alpine  # this only needs printf, so it should be as small as possible
-  variables:
-    GIT_DEPTH: 1
-  script:
-    - printf '\x1b[33mJobs that require KVM need special runners, these jobs are opt-in.  To set up your fork to run KVM jobs, go to Settings -> CI/CD -> Variables, and add a variable called RUN_KVM_JOBS with a value of "1".  This link should take you there:\n'
-    - printf "\x1b[32m${CI_SERVER_URL}/$CI_PROJECT_PATH/-/settings/ci_cd#js-cicd-variables-settings\n"
-
-
-kvm 24 default x86:
-  <<: *kvm-template
-
-
 pages:
   extends: .base
   stage: deploy
@@ -389,7 +362,7 @@ deploy_nightly:
     - mkdir $fdroidserver
     - git ls-remote https://gitlab.com/fdroid/fdroidserver.git master
     - curl --silent https://gitlab.com/fdroid/fdroidserver/-/archive/master/fdroidserver-master.tar.gz
-        | tar -xz --directory=$fdroidserver --strip-components=1
+      | tar -xz --directory=$fdroidserver --strip-components=1
     - export PATH="$fdroidserver:$PATH"
     - export PYTHONPATH="$fdroidserver:$fdroidserver/examples"
     - export PYTHONUNBUFFERED=true