Merge remote-tracking branch 'refs/remotes/origin/main'

Author: TonyWildish-BH

.github/workflows/cli-package.yml

@@ -9,15 +9,15 @@ on:
       environment:
         description: The environment to run this workflow in
         type: environment
-        default: CICD
+        default: test
         required: true
 
 jobs:
   build:
     runs-on: ubuntu-latest
     # environment is used to access the secrets for Azure credentials
     # to sign in to a container registry to re-use a dev container image as a build cache
-    environment: ${{ inputs.environment || 'CICD'}}
+    environment: ${{ inputs.environment || 'test'}}
 
     steps:
       - name: Checkout (GitHub)

.github/workflows/deploy_tre.yml

@@ -14,7 +14,7 @@ on:  # yamllint disable-line rule:truthy
       environment:
         description: The environment to run this workflow in
         type: environment
-        default: CICD
+        default: test
         required: true
 
 # This will prevent multiple runs of this entire workflow.
@@ -35,7 +35,7 @@ jobs:
       e2eTestsCustomSelector: >-
         ${{ (github.event_name == 'push' && 'extended or extended_aad')
         || 'extended or extended_aad or shared_services or airlock' }}
-      environmentName: ${{ github.event.inputs.environment || 'CICD' }}
+      environmentName: ${{ github.event.inputs.environment || 'test' }}
       E2E_TESTS_NUMBER_PROCESSES: 1
       DEVCONTAINER_TAG: 'latest'
     secrets: