diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 549c03698c..3e306f025b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -206,6 +206,7 @@ stages: INTEGRATION_TEST_SP_APP_ID: $(INTEGRATION_TEST_SP_APP_ID) INTEGRATION_TEST_TENANT_ID: $(INTEGRATION_TEST_TENANT_ID) INTEGRATION_TEST_SP_PASSWORD: $(INTEGRATION_TEST_SP_PASSWORD) + INTEGRATION_TEST_RESOURCE_GROUP_NAME: $(INTEGRATION_TEST_RESOURCE_GROUP_NAME) AWS_ACCESS_KEY_ID: $(AWS_ACCESS_KEY_ID) AWS_SECRET_ACCESS_KEY: $(AWS_SECRET_ACCESS_KEY) AWS_REGION: $(AWS_REGION) diff --git a/test/functional/corerp/resources/mongodb_test.go b/test/functional/corerp/resources/mongodb_test.go index f0ae3156f2..d2d961fc8c 100644 --- a/test/functional/corerp/resources/mongodb_test.go +++ b/test/functional/corerp/resources/mongodb_test.go @@ -6,6 +6,7 @@ package resource_test import ( + "os" "testing" "github.com/project-radius/radius/pkg/resourcemodel" @@ -219,8 +220,12 @@ func Test_MongoDB_Recipe_Parameters(t *testing.T) { template := "testdata/corerp-resources-mongodb-recipe-parameters.bicep" name := "corerp-resources-mongodb-recipe-parameters" appNamespace := "corerp-resources-mongodb-recipe-param-app" - - t.Skip("This test is flaky, see issue: https://github.com/project-radius/radius/issues/4992") + rg := os.Getenv("INTEGRATION_TEST_RESOURCE_GROUP_NAME") + // skip the test if INTEGRATION_TEST_RESOURCE_GROUP_NAME is not set + // for running locally set the INTEGRATION_TEST_RESOURCE_GROUP_NAME with the test resourceGroup + if rg == "" { + t.Skip("This test needs the env variable INTEGRATION_TEST_RESOURCE_GROUP_NAME to be set") + } test := corerp.NewCoreRPTest(t, name, []corerp.TestStep{ { @@ -237,7 +242,7 @@ func Test_MongoDB_Recipe_Parameters(t *testing.T) { App: name, }, { - Name: "mcp-app-ctnr", + Name: "mdb-app-ctnr", Type: validation.ContainersResource, App: name, }, @@ -249,12 +254,12 @@ func Test_MongoDB_Recipe_Parameters(t *testing.T) { { Provider: resourcemodel.ProviderAzure, LocalID: outputresource.LocalIDAzureCosmosAccount, - Identity: "account-developer-parameters", + Identity: "acnt-developer-" + rg, }, { Provider: resourcemodel.ProviderAzure, LocalID: outputresource.LocalIDAzureCosmosDBMongo, - Identity: "mongodb-developer-parameters", + Identity: "mdb-developer-" + rg, }, }, }, @@ -263,7 +268,7 @@ func Test_MongoDB_Recipe_Parameters(t *testing.T) { K8sObjects: &validation.K8sObjectSet{ Namespaces: map[string][]validation.K8sObject{ appNamespace: { - validation.NewK8sPodForResource(name, "mcp-app-ctnr"), + validation.NewK8sPodForResource(name, "mdb-app-ctnr"), }, }, }, diff --git a/test/functional/corerp/resources/testdata/corerp-resources-mongodb-recipe-parameters.bicep b/test/functional/corerp/resources/testdata/corerp-resources-mongodb-recipe-parameters.bicep index cd5ade555c..162c7f6025 100644 --- a/test/functional/corerp/resources/testdata/corerp-resources-mongodb-recipe-parameters.bicep +++ b/test/functional/corerp/resources/testdata/corerp-resources-mongodb-recipe-parameters.bicep @@ -44,7 +44,7 @@ resource app 'Applications.Core/applications@2022-03-15-privatepreview' = { } resource webapp 'Applications.Core/containers@2022-03-15-privatepreview' = { - name: 'mcp-app-ctnr' + name: 'mdb-app-ctnr' location: 'global' properties: { application: app.id @@ -77,8 +77,8 @@ resource recipedb 'Applications.Link/mongoDatabases@2022-03-15-privatepreview' = recipe: { name: 'mongodb' parameters: { - documentdbName: 'account-developer-parameters' - mongodbName: 'mongodb-developer-parameters' + documentdbName: 'acnt-developer-${rg}' + mongodbName: 'mdb-developer-${rg}' } } }