From f84f38d6b110086f4f705ad571a87e22c07784ed Mon Sep 17 00:00:00 2001 From: zhihaoguo Date: Fri, 28 Oct 2022 08:55:53 +0800 Subject: [PATCH 1/2] fix pipeline --- .../jdbc/mysql/test-resources.json | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sdk/spring/spring-cloud-azure-integration-tests/test-resources/jdbc/mysql/test-resources.json b/sdk/spring/spring-cloud-azure-integration-tests/test-resources/jdbc/mysql/test-resources.json index 6653cfdc2322..3401581f3dc1 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/test-resources/jdbc/mysql/test-resources.json +++ b/sdk/spring/spring-cloud-azure-integration-tests/test-resources/jdbc/mysql/test-resources.json @@ -92,11 +92,11 @@ }, "variables": { "location": "[resourceGroup().location]", - "skipCondition": "[or(not(equals(resourceGroup().location, parameters('skipResourceRegion'))), greater(parameters('currentEpoch'), parameters('resourceStartTime')))] + "notSkipCondition": "[or(not(equals(resourceGroup().location, parameters('skipResourceRegion'))), greater(parameters('currentEpoch'), parameters('resourceStartTime')))]" }, "resources": [ { - "condition": "[variables('skipCondition')]", + "condition": "[variables('notSkipCondition')]", "type": "Microsoft.DBforMySQL/servers", "apiVersion": "2017-12-01", "name": "[parameters('serverName')]", @@ -125,7 +125,7 @@ } }, { - "condition": "[variables('skipCondition')]", + "condition": "[variables('notSkipCondition')]", "type": "Microsoft.DBforMySQL/servers/administrators", "apiVersion": "2017-12-01", "name": "[concat(parameters('serverName'), '/ActiveDirectory')]", @@ -140,7 +140,7 @@ } }, { - "condition": "[variables('skipCondition')]", + "condition": "[variables('notSkipCondition')]", "type": "Microsoft.DBforMySQL/servers/configurations", "apiVersion": "2017-12-01", "name": "[concat(parameters('serverName'), '/audit_log_enabled')]", @@ -153,7 +153,7 @@ } }, { - "condition": "[variables('skipCondition')]", + "condition": "[variables('notSkipCondition')]", "type": "Microsoft.DBforMySQL/servers/configurations", "apiVersion": "2017-12-01", "name": "[concat(parameters('serverName'), '/gtid_mode')]", @@ -166,7 +166,7 @@ } }, { - "condition": "[variables('skipCondition')]", + "condition": "[variables('notSkipCondition')]", "type": "Microsoft.DBforMySQL/servers/configurations", "apiVersion": "2017-12-01", "name": "[concat(parameters('serverName'), '/init_connect')]", @@ -178,7 +178,7 @@ } }, { - "condition": "[variables('skipCondition')]", + "condition": "[variables('notSkipCondition')]", "type": "Microsoft.DBforMySQL/servers/databases", "apiVersion": "2017-12-01", "name": "[concat(parameters('serverName'), '/db')]", @@ -191,7 +191,7 @@ } }, { - "condition": "[variables('skipCondition')]", + "condition": "[variables('notSkipCondition')]", "type": "Microsoft.DBforMySQL/servers/firewallRules", "apiVersion": "2017-12-01", "name": "[concat(parameters('serverName'), '/AllowAll_2022-9-14_18-12-24')]", @@ -204,7 +204,7 @@ } }, { - "condition": "[variables('skipCondition')]", + "condition": "[variables('notSkipCondition')]", "type": "Microsoft.DBforMySQL/servers/securityAlertPolicies", "apiVersion": "2017-12-01", "name": "[concat(parameters('serverName'), '/Default')]", @@ -235,11 +235,11 @@ }, "AZURE_MYSQL_IT_SKIPRUNNING": { "type": "string", - "value": "[if(or(not(equals(resourceGroup().location, variables('skipResourceRegion'))), greater(parameters('currentEpoch'), parameters('resourceStartTime'))), 'notskip', 'skipRunning')]" + "value": "[if(variables('notSkipCondition'), 'notskip', 'skipRunning')]" }, "AZURE_MYSQL_ENDPOINT": { "type": "string", - "[if(or(not(equals(resourceGroup().location, variables('skipResourceRegion'))), greater(parameters('currentEpoch'), parameters('resourceStartTime'))), 'skipResource', reference(parameters('serverName')).fullyQualifiedDomainName))]" + "[if(variables('notSkipCondition'), reference(parameters('serverName')).fullyQualifiedDomainName,'skipResource')]" } } } From 5f48ccc93eacef0c59f01b33f9f31c8dd1cc405f Mon Sep 17 00:00:00 2001 From: zhihaoguo Date: Fri, 28 Oct 2022 09:17:21 +0800 Subject: [PATCH 2/2] fix json --- .../test-resources/jdbc/mysql/test-resources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/spring/spring-cloud-azure-integration-tests/test-resources/jdbc/mysql/test-resources.json b/sdk/spring/spring-cloud-azure-integration-tests/test-resources/jdbc/mysql/test-resources.json index 3401581f3dc1..a1a2e6db6015 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/test-resources/jdbc/mysql/test-resources.json +++ b/sdk/spring/spring-cloud-azure-integration-tests/test-resources/jdbc/mysql/test-resources.json @@ -239,7 +239,7 @@ }, "AZURE_MYSQL_ENDPOINT": { "type": "string", - "[if(variables('notSkipCondition'), reference(parameters('serverName')).fullyQualifiedDomainName,'skipResource')]" + "value": "[if(variables('notSkipCondition'), reference(parameters('serverName')).fullyQualifiedDomainName,'skipResource')]" } } }