From 703234231a542ec3faa8182b959328cf1e87c638 Mon Sep 17 00:00:00 2001 From: Tesma Jose <113982972+tesmarishy@users.noreply.github.com> Date: Thu, 4 Dec 2025 11:49:47 +0530 Subject: [PATCH 1/5] feat: added metadata in app definition (#835) --- schemas/appdef.schema.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/schemas/appdef.schema.json b/schemas/appdef.schema.json index 0023b19ae..2d26d36f9 100644 --- a/schemas/appdef.schema.json +++ b/schemas/appdef.schema.json @@ -26,6 +26,9 @@ }, "solutionDescriptor": { "type": "boolean" + }, + "metadata" : { + "$ref": "#/definitions/metaString" } }, "definitions": { @@ -34,6 +37,16 @@ "additionalProperties": { "type": "string" } + }, + "metaString": { + "type": ["object", "null"], + "properties": { + "helmReleaseNameStrategy": { + "type": "string", + "enum": ["perApplication", "perVersion", "perDeployment"] + } + }, + "additionalProperties": false } }, "required": [ @@ -45,4 +58,4 @@ "deployParameters", "technicalConfigurationParameters" ] -} +} \ No newline at end of file From 26c11af381fd446c941e96aa623d559bd41c89d5 Mon Sep 17 00:00:00 2001 From: tesmarishy Date: Fri, 5 Dec 2025 15:18:01 +0530 Subject: [PATCH 2/5] fix: modified test cases --- test_data/test_templates/appdefs/application-2.yaml | 1 + test_data/test_templates/appdefs/application-3.yaml | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 test_data/test_templates/appdefs/application-3.yaml diff --git a/test_data/test_templates/appdefs/application-2.yaml b/test_data/test_templates/appdefs/application-2.yaml index 3a1b23893..87c998cb2 100644 --- a/test_data/test_templates/appdefs/application-2.yaml +++ b/test_data/test_templates/appdefs/application-2.yaml @@ -5,3 +5,4 @@ groupId: "org.qubership" supportParallelDeploy: true deployParameters: {} technicalConfigurationParameters: {} +metadata: {} \ No newline at end of file diff --git a/test_data/test_templates/appdefs/application-3.yaml b/test_data/test_templates/appdefs/application-3.yaml new file mode 100644 index 000000000..0ee4ccdc6 --- /dev/null +++ b/test_data/test_templates/appdefs/application-3.yaml @@ -0,0 +1,9 @@ +name: "application-3" +registryName: "registry-2" +artifactId: "application-3" +groupId: "org.qubership" +supportParallelDeploy: true +deployParameters: {} +technicalConfigurationParameters: {} +metadata: + helmReleaseNameStrategy: perApplication \ No newline at end of file From 8d6b3874a188eb1d92a9d8dbc0149e2d5ecf401f Mon Sep 17 00:00:00 2001 From: tesmarishy Date: Fri, 5 Dec 2025 15:39:14 +0530 Subject: [PATCH 3/5] fix: corrected test data --- .../cluster-01/env-01/AppDefs/application-2.yml | 1 + .../cluster-01/env-01/AppDefs/application-3.yml | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 test_data/test_environments/cluster-01/env-01/AppDefs/application-3.yml diff --git a/test_data/test_environments/cluster-01/env-01/AppDefs/application-2.yml b/test_data/test_environments/cluster-01/env-01/AppDefs/application-2.yml index 3a1b23893..9a0f9302e 100644 --- a/test_data/test_environments/cluster-01/env-01/AppDefs/application-2.yml +++ b/test_data/test_environments/cluster-01/env-01/AppDefs/application-2.yml @@ -5,3 +5,4 @@ groupId: "org.qubership" supportParallelDeploy: true deployParameters: {} technicalConfigurationParameters: {} +metadata: {} diff --git a/test_data/test_environments/cluster-01/env-01/AppDefs/application-3.yml b/test_data/test_environments/cluster-01/env-01/AppDefs/application-3.yml new file mode 100644 index 000000000..5e2d71cbe --- /dev/null +++ b/test_data/test_environments/cluster-01/env-01/AppDefs/application-3.yml @@ -0,0 +1,9 @@ +name: "application-2" +registryName: "registry-2" +artifactId: "application-2" +groupId: "org.qubership" +supportParallelDeploy: true +deployParameters: {} +technicalConfigurationParameters: {} +metadata: + helmReleaseNameStrategy: perApplication From 69e16f0798feaf0eadf0e6f58869e70488365f8a Mon Sep 17 00:00:00 2001 From: tesmarishy Date: Fri, 5 Dec 2025 15:47:50 +0530 Subject: [PATCH 4/5] fix: corrected test issues --- .../cluster-01/env-01/AppDefs/application-3.yml | 4 ++-- .../cluster03/rpo-replacement-mode/AppDefs/application-2.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test_data/test_environments/cluster-01/env-01/AppDefs/application-3.yml b/test_data/test_environments/cluster-01/env-01/AppDefs/application-3.yml index 5e2d71cbe..7089d815f 100644 --- a/test_data/test_environments/cluster-01/env-01/AppDefs/application-3.yml +++ b/test_data/test_environments/cluster-01/env-01/AppDefs/application-3.yml @@ -1,6 +1,6 @@ -name: "application-2" +name: "application-3" registryName: "registry-2" -artifactId: "application-2" +artifactId: "application-3" groupId: "org.qubership" supportParallelDeploy: true deployParameters: {} diff --git a/test_data/test_environments/cluster03/rpo-replacement-mode/AppDefs/application-2.yml b/test_data/test_environments/cluster03/rpo-replacement-mode/AppDefs/application-2.yml index 3a1b23893..87c998cb2 100644 --- a/test_data/test_environments/cluster03/rpo-replacement-mode/AppDefs/application-2.yml +++ b/test_data/test_environments/cluster03/rpo-replacement-mode/AppDefs/application-2.yml @@ -5,3 +5,4 @@ groupId: "org.qubership" supportParallelDeploy: true deployParameters: {} technicalConfigurationParameters: {} +metadata: {} \ No newline at end of file From f31b7d9a7e0b32d44d6b9f967bfc4d34ba01ec18 Mon Sep 17 00:00:00 2001 From: tesmarishy Date: Fri, 5 Dec 2025 16:49:11 +0530 Subject: [PATCH 5/5] fixing test data --- .../cluster03/rpo-replacement-mode/AppDefs/application-2.yml | 3 +-- test_data/test_templates/appdefs/application-2.yaml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/test_data/test_environments/cluster03/rpo-replacement-mode/AppDefs/application-2.yml b/test_data/test_environments/cluster03/rpo-replacement-mode/AppDefs/application-2.yml index 87c998cb2..f88d42173 100644 --- a/test_data/test_environments/cluster03/rpo-replacement-mode/AppDefs/application-2.yml +++ b/test_data/test_environments/cluster03/rpo-replacement-mode/AppDefs/application-2.yml @@ -4,5 +4,4 @@ artifactId: "application-2" groupId: "org.qubership" supportParallelDeploy: true deployParameters: {} -technicalConfigurationParameters: {} -metadata: {} \ No newline at end of file +technicalConfigurationParameters: {} \ No newline at end of file diff --git a/test_data/test_templates/appdefs/application-2.yaml b/test_data/test_templates/appdefs/application-2.yaml index 87c998cb2..f88d42173 100644 --- a/test_data/test_templates/appdefs/application-2.yaml +++ b/test_data/test_templates/appdefs/application-2.yaml @@ -4,5 +4,4 @@ artifactId: "application-2" groupId: "org.qubership" supportParallelDeploy: true deployParameters: {} -technicalConfigurationParameters: {} -metadata: {} \ No newline at end of file +technicalConfigurationParameters: {} \ No newline at end of file