From 915a3d45609ff0f80efef326346affab262a973e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simo=20F=C3=A4lt?= <simo.falt@qt.io>
Date: Mon, 19 Feb 2024 11:28:39 +0200
Subject: [PATCH] COIN: Move skipping Debian instructions to qt5 repo

Task-number: QTBUG-122447
Change-Id: I385d60d891c68edc3aa053d3561335a46b26923b
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit df1efc70b0cb3eeff4c59adbf58702af1d9a9200)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 233ce5b018a5bca2b9a0c54a57707edcfa14c04e)
---
 .../debian/prepare_debian_env.yaml             | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/coin/instructions/debian/prepare_debian_env.yaml b/coin/instructions/debian/prepare_debian_env.yaml
index fd130cebc72..4c004adaa58 100644
--- a/coin/instructions/debian/prepare_debian_env.yaml
+++ b/coin/instructions/debian/prepare_debian_env.yaml
@@ -47,20 +47,10 @@ instructions:
     variableName: COIN_SKIP_DEBIAN
     variableValue: "MISSING_DEBIAN_INST"
     enable_if:
-      condition: or
-      conditions:
-        - condition: runtime
-          env_var: TESTED_MODULE_COIN
-          equals_value: "qtactiveqt"
-        - condition: runtime
-          env_var: TESTED_MODULE_COIN
-          equals_value: "qtqa"
-        - condition: runtime
-          env_var: TESTED_MODULE_COIN
-          equals_value: "qtdoc"
-        - condition: runtime
-          env_var: TESTED_MODULE_COIN
-          equals_value: "qt5"
+      condition: runtime
+      env_var: COIN_SKIP_DEBIAN_MODULES
+      contains_value: "{{.Env.TESTED_MODULE_COIN}}"
+
   # Set version info to environment
   - type: ParseEnvironmentVariableFromFile
     regex: "QT_REPO_MODULE_VERSION \"(?P<QT_REPO_MODULE_VERSION>.*)\""