Updates

.github/workflows/test.yaml

@@ -36,6 +36,7 @@ jobs:
           - name: demo
             runOnPullRequest: true
             app: demo
+            env: default
             path: ./samples/demo/app.bicep
             args: --application demo
             uiTestFile: tests/demo/demo.app.spec.ts
@@ -45,24 +46,26 @@ jobs:
           - name: dapr
             runOnPullRequest: true
             app: dapr
+            env: default
             path: ./samples/dapr/dapr.bicep
             enableDapr: true
           - name: volumes
             runOnPullRequest: true
             app: myapp
+            env: default
             path: ./samples/volumes/app.bicep
             enableDapr: false
           - name: eshop-containers
             runOnPullRequest: true
             app: eshop
-            env: containers-eshop-env
+            env: containers-eshop
             path: ./samples/eshop/eshop.bicep
             uiTestFile: tests/eshop/eshop.app.spec.ts
             enableDapr: false
           - name: eshop-azure
             runOnPullRequest: false
             app: eshop
-            env: azure-eshop-env
+            env: azure-eshop
             path: ./samples/eshop/eshop.bicep
             uiTestFile: tests/eshop/eshop.app.spec.ts
             credential: azure
@@ -72,7 +75,7 @@ jobs:
           - name: eshop-aws
             runOnPullRequest: false
             app: eshop
-            env: aws-eshop-env
+            env: aws-eshop
             path: ./samples/eshop/iac/eshop.bicep
             uiTestFile: tests/eshop/eshop.app.spec.ts
             credential: aws
@@ -251,7 +254,7 @@ jobs:
       - name: Wait for all pods to be ready
         if: steps.gen-id.outputs.RUN_TEST == 'true'
         run: |
-          namespace="default-${{ matrix.app }}"
+          namespace="${{ matrix.env }}-${{ matrix.app }}"
           label="radapp.io/application=${{ matrix.app }}"
           kubectl wait --for=condition=Ready pod -l $label -n $namespace --timeout=5m
       - name: Run Playwright Test
@@ -285,7 +288,7 @@ jobs:
           # Create pod-logs directory
           mkdir -p playwright/pod-logs/${{ matrix.name }}
           # Get pod logs and save to file
-          namespace="default-${{ matrix.app }}"
+          namespace="${{ matrix.env }}-${{ matrix.app }}"
           label="radius.dev/application=${{ matrix.app }}"
           pod_names=($(kubectl get pods -l $label -n $namespace -o jsonpath='{.items[*].metadata.name}'))
           for pod_name in "${pod_names[@]}"; do
@@ -309,7 +312,7 @@ jobs:
       - name: Delete app
         if: steps.gen-id.outputs.RUN_TEST == 'true'
         run: |
-          rad app delete  ${{ matrix.app }} -y
+          rad app delete ${{ matrix.app }} -y
       - name: Delete Azure resource group
         if: always() && steps.gen-id.outputs.RUN_TEST == 'true' && steps.create-azure-resource-group.outcome == 'success'
         run: |

samples/eshop/environments/aws.bicep

@@ -10,7 +10,7 @@ param awsRegion string
 param eksClusterName string
 
 resource awsEshopEnv 'Applications.Core/environments@2023-10-01-preview' = {
-  name: 'aws-eshop-env'
+  name: 'aws-eshop'
   properties: {
     compute: {
       kind: 'kubernetes'

samples/eshop/environments/azure.bicep

@@ -7,7 +7,7 @@ param azureResourceGroup string = resourceGroup().name
 param azureSubscription string = subscription().subscriptionId
 
 resource azureEShopEnv 'Applications.Core/environments@2023-10-01-preview' = {
-  name: 'azure-eshop-env'
+  name: 'azure-eshop'
   properties: {
     compute: {
       kind: 'kubernetes'

samples/eshop/environments/containers.bicep

@@ -1,7 +1,7 @@
 import radius as rad
 
 resource containersEShopEnv 'Applications.Core/environments@2023-10-01-preview' = {
-  name: 'containers-eshop-env'
+  name: 'containers-eshop'
   properties: {
     compute: {
       kind: 'kubernetes'