From fc9d9c1a2b72bd6ff6e0300744dcead2a19a804c Mon Sep 17 00:00:00 2001
From: Matti Paaso <matti.paaso@qt.io>
Date: Tue, 5 Sep 2023 13:54:13 +0300
Subject: [PATCH] Change Axivion configuration

Change-Id: Ie39086efa69b7f1bad4e400ca5a32b9f0fc29c3e
Reviewed-by: Toni Saario <toni.saario@qt.io>
---
 coin/axivion/ci_config_linux.json             | 28 ++-----------------
 .../coin_module_axivion_template_v2.yaml      |  6 ++--
 .../coin_module_build_template_v2.yaml        | 12 ++++----
 .../coin_qtbase_build_template_v2.yaml        | 12 ++++----
 coin/instructions/prepare_building_env.yaml   | 10 +++++++
 5 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/coin/axivion/ci_config_linux.json b/coin/axivion/ci_config_linux.json
index 2354781590..1999760450 100644
--- a/coin/axivion/ci_config_linux.json
+++ b/coin/axivion/ci_config_linux.json
@@ -1,9 +1,5 @@
 {
     "Project": {
-        "Git": {
-            "_active": true,
-            "sourceserver_gitdir": "/data/axivion/databases/$(env:TESTED_MODULE_COIN).git"
-        },
         "BuildSystemIntegration": {
             "child_order": [
                 "GCCSetup",
@@ -34,32 +30,14 @@
             "plugin_files": [
                 "build/plugins/*/lib*.so*.ir"
             ]
-        },
-        "Project-GlobalOptions": {
-            "ci_mode": {
-                "clean_before": false
-            },
-            "directory": "../work/qt/$(env:TESTED_MODULE_COIN)",
-            "ir": "build/$(env:TESTED_MODULE_COIN).ir",
-            "name": "qt_$(env:TESTED_MODULE_COIN)_dev_$(env:TARGET_OS_COIN)"
-        }
-    },
-    "Results": {
-        "Dashboard": {
-            "dashboard_url": "https://axivion-srv.ci.qt.io/axivion/"
-        },
-        "Database": {
-            "ci_mode": {
-                "directory": "/data/axivion/databases"
-            }
         }
     },
     "_Format": "1.0",
-    "_Version": "trunk-9e0ef9c5818",
+    "_Version": "7.6.2",
     "_VersionNum": [
         7,
         6,
-        9999,
-        11489
+        2,
+        12725
     ]
 }
diff --git a/coin/instructions/coin_module_axivion_template_v2.yaml b/coin/instructions/coin_module_axivion_template_v2.yaml
index 0eebe34e0d..81d814b5c3 100644
--- a/coin/instructions/coin_module_axivion_template_v2.yaml
+++ b/coin/instructions/coin_module_axivion_template_v2.yaml
@@ -92,7 +92,7 @@ instructions:
   - *build_environment_axivion
   - *analysis_instructions_axivion
 enable_if:
-  condition: property
-  property: features
-  contains_value: Axivion
+  condition: runtime
+  env_var: AXIVION_ANALYSIS
+  equals_value: "1"
 
diff --git a/coin/instructions/coin_module_build_template_v2.yaml b/coin/instructions/coin_module_build_template_v2.yaml
index 2b36fb1c95..48c671ca42 100644
--- a/coin/instructions/coin_module_build_template_v2.yaml
+++ b/coin/instructions/coin_module_build_template_v2.yaml
@@ -27,18 +27,18 @@ instructions:
         - condition: property
           property: features
           not_contains_value: "DebianPackaging"
-        - condition: property
-          property: features
-          not_contains_value: Axivion
+        - condition: runtime
+          env_var: AXIVION_ANALYSIS
+          not_equals_value: "1"
   - type: Group
     instructions:
        - !include "{{qt/qtbase}}/coin_module_axivion_template_v2.yaml"
     enable_if:
       condition: and
       conditions:
-        - condition: property
-          property: features
-          contains_value: Axivion
+        - condition: runtime
+          env_var: AXIVION_ANALYSIS
+          equals_value: "1"
         - condition: runtime
           env_var: TESTED_MODULE_COIN
           not_equals_value: "qtdoc"
diff --git a/coin/instructions/coin_qtbase_build_template_v2.yaml b/coin/instructions/coin_qtbase_build_template_v2.yaml
index e5ae8068e4..a048b2ba8a 100644
--- a/coin/instructions/coin_qtbase_build_template_v2.yaml
+++ b/coin/instructions/coin_qtbase_build_template_v2.yaml
@@ -20,16 +20,16 @@ instructions:
         - condition: property
           property: features
           not_contains_value: "DebianPackaging"
-        - condition: property
-          property: features
-          not_contains_value: Axivion
+        - condition: runtime
+          env_var: AXIVION_ANALYSIS
+          not_equals_value: "1"
   - type: Group
     instructions:
        - !include "{{qt/qtbase}}/coin_module_axivion_template_v2.yaml"
     enable_if:
-      condition: property
-      property: features
-      contains_value: Axivion
+      condition: runtime
+      env_var: AXIVION_ANALYSIS
+      equals_value: "1"
   - type: Group
     instructions:
       - type: Group
diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml
index 53fc2ae60c..e41f7eea4d 100644
--- a/coin/instructions/prepare_building_env.yaml
+++ b/coin/instructions/prepare_building_env.yaml
@@ -26,6 +26,16 @@ instructions:
       property: host.os
       equals_value: Windows
 
+  # Enable Axivion_analysis for Qt
+  - type: EnvironmentVariable
+    variableName: AXIVION_ANALYSIS
+    variableValue: "1"
+    enable_if:
+      condition: property
+      property: features
+      contains_value: Axivion
+
+
   # Export ICC specific env. variables
   - type: Group
     instructions: