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 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..7089d815f --- /dev/null +++ b/test_data/test_environments/cluster-01/env-01/AppDefs/application-3.yml @@ -0,0 +1,9 @@ +name: "application-3" +registryName: "registry-2" +artifactId: "application-3" +groupId: "org.qubership" +supportParallelDeploy: true +deployParameters: {} +technicalConfigurationParameters: {} +metadata: + helmReleaseNameStrategy: perApplication 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..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,4 +4,4 @@ artifactId: "application-2" groupId: "org.qubership" supportParallelDeploy: true deployParameters: {} -technicalConfigurationParameters: {} +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 3a1b23893..f88d42173 100644 --- a/test_data/test_templates/appdefs/application-2.yaml +++ b/test_data/test_templates/appdefs/application-2.yaml @@ -4,4 +4,4 @@ artifactId: "application-2" groupId: "org.qubership" supportParallelDeploy: true deployParameters: {} -technicalConfigurationParameters: {} +technicalConfigurationParameters: {} \ 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