Skip to content

Commit

Permalink
Fix flaky recipe parameter test by removing constant resource name (#…
Browse files Browse the repository at this point in the history
…4995)

# Description

Fix flaky recipe parameter test by removing constant resource name
Added resourceGroup name to the account and mongodb name.

## Issue reference

<!--
We strive to have all PR being opened based on an issue, where the
problem or feature have been discussed prior to implementation.
-->

Fixes: #4992 

## Checklist

Please make sure you've completed the relevant tasks for this PR, out of
the following list:

* [x] Code compiles correctly
* [ ] Adds necessary unit tests for change
* [ ] Adds necessary E2E tests for change
* [x] Unit tests passing
* [ ] Extended the documentation / Created issue for it
  • Loading branch information
mishrapratikshya authored Jan 23, 2023
1 parent f5d1370 commit b373d93
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
1 change: 1 addition & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
17 changes: 11 additions & 6 deletions test/functional/corerp/resources/mongodb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
package resource_test

import (
"os"
"testing"

"github.com/project-radius/radius/pkg/resourcemodel"
Expand Down Expand Up @@ -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{
{
Expand All @@ -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,
},
Expand All @@ -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,
},
},
},
Expand All @@ -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"),
},
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}'
}
}
}
Expand Down

0 comments on commit b373d93

Please sign in to comment.