COIN: Move skipping Debian instructions to qt5 repo

Pick-to: 6.6 6.7 Task-number: QTBUG-122447 Change-Id: I385d60d891c68edc3aa053d3561335a46b26923b Reviewed-by: Toni Saario <[email protected]>
qt · Feb 22, 2024 · df1efc7 · df1efc7
1 parent 576c916
commit df1efc7
Showing 1 changed file with 4 additions and 14 deletions.
diff --git a/coin/instructions/debian/prepare_debian_env.yaml b/coin/instructions/debian/prepare_debian_env.yaml
@@ -54,20 +54,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>.*)\""