Merge branch 'next' into dependabot/npm_and_yarn/Contentful-Schema/ax…

…ios-and-contentful-export-1.6.1

.github/workflows/app-deploy.yml

@@ -27,6 +27,9 @@ jobs:
 
     steps:
 
+      - name: Docker pull check
+        run: docker pull ghcr.io/dfe-digital/childrens-social-care-cpd:${{inputs.tag}}
+
       - name: Sign in to Azure 
         uses: azure/login@v1
         with:

.github/workflows/create-release.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - next
 
 permissions:
   contents: read # for checkout

.github/workflows/docker-dev-integration-tests.yml

@@ -3,8 +3,8 @@ name: Run integration tests
 on:
   pull_request:
     branches:
-      - master
       - main
+      - next
 jobs:
   build-test-scan:
     name: Build image and integration test

.github/workflows/docker-publish.yml

@@ -45,17 +45,16 @@ jobs:
 
       # Sort out the image tags 
       - name: Set initial tag
-        run: echo "\=${{ env.REGISTRY }}/${{ env.IMAGE_NAME_LOWER }}:${{ env.RELEASE_TAG }}" >> $GITHUB_ENV
+        run: echo "IMAGE_TAGS=${{ env.REGISTRY }}/${{ env.IMAGE_NAME_LOWER }}:${{ env.RELEASE_TAG }}" >> $GITHUB_ENV
 
       - name: Add latest tag if we're not production release
-        if: contains(env.RELEASE_TAG, "dev")
-        run: echo "IMAGE_TAGS=${IMAGE_TAGS},${{ env.REGISTRY }}/${{ env.IMAGE_NAME_LOWER }}:latest" >> $GITHUB_ENV
+        if: contains(env.RELEASE_TAG, 'next')
+        run: echo "IMAGE_TAGS=${{ env.IMAGE_TAGS }},${{ env.REGISTRY }}/${{ env.IMAGE_NAME_LOWER }}:latest" >> $GITHUB_ENV
 
       #debug
       - name: Log the tags
         run: echo "Calculated tags value => ${{ env.IMAGE_TAGS }}"
 
-
       # Workaround: https://github.com/docker/build-push-action/issues/461
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
@@ -86,7 +85,7 @@ jobs:
         with:
           context: Childrens-Social-Care-CPD
           push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_LOWER }}:${{ env.RELEASE_TAG }},${{ env.REGISTRY }}/${{ env.IMAGE_NAME_LOWER }}:latest
+          tags: ${{ env.IMAGE_TAGS }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             VCSREF=${{ env.sha_short }}

.github/workflows/dotnet.yml

@@ -5,7 +5,7 @@ name: .NET Test
 
 on: 
   pull_request:
-    branches: [ "master", "main" ]
+    branches: [ "main", "next" ]
 
 jobs:
   test:

.github/workflows/load-testing.yml

@@ -59,7 +59,9 @@ jobs:
         run: terraform -chdir=Terraform apply -auto-approve -input=false
 
       - name: Install Locust Load Test Tool
-        run: pip3 install locust
+        run: |
+            pip3 install locust
+            pip3 install charset_normalizer
 
       - name: Sign in to Azure 
         uses: azure/login@v1
@@ -75,11 +77,11 @@ jobs:
       - name: Whitelist Runner IP
         run: az network nsg rule create -g s185d03-childrens-social-care-cpd-rg --nsg-name s185d03-chidrens-social-care-cpd-sn01-nsg -n GitHubRunnerRule --priority 4000 --source-address-prefixes ${{ env.theIP }} --source-port-ranges '*' --destination-address-prefixes '*' --destination-port-ranges '*' --access Allow --protocol Tcp --description "Allow Access from GitHub Action"
 
-      - name: Wait for 15 minutes
-        run: sleep 900s
+      - name: Wait for 10 minutes
+        run: sleep 600s
 
       - name: Run Load Test
-        run: locust -f ./LoadTest/locustfile.py --headless -u 50 -r 1 --run-time 60s -H https://20.107.65.156/       
+        run: locust -f ./LoadTest/locustfile.py --headless -u 5 -r 10 --run-time 300s -H https://20.107.65.156/       
 
       - name: Terraform Destroy 3
         if: always()

.github/workflows/sonarqube.yml

@@ -2,8 +2,8 @@
     on:
       pull_request:
         branches:
-          - master
           - main
+          - next
     jobs:
       code-analysis:
         name: Static code analysis
@@ -62,5 +62,5 @@
                 /d:sonar.token="${{ secrets.SONAR_TOKEN }}" \
                 /d:sonar.host.url="https://sonarcloud.io"
               dotnet build --no-incremental
-              dotnet-coverage collect -f xml -o coverage.xml "dotnet test"
+              dotnet-coverage collect --settings dotnet-cover-config.xml -f xml -o coverage.xml "dotnet test"
               dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"

.github/workflows/terraform-fmt.yml

@@ -2,7 +2,7 @@ name: 'Terraform Format'
 
 on: 
   pull_request:
-    branches: [ "master", "main" ]
+    branches: [ "main", "next" ]
 
 jobs:
   terraform-fmt:

.github/workflows/terraform-tflint.yml

@@ -2,7 +2,7 @@ name: 'Terraform TFLint'
 
 on: 
   pull_request:
-    branches: [ "master", "main" ]
+    branches: [ "main", "next" ]
 
 jobs:
   terraform-tflint:

.releaserc

@@ -1,5 +1,5 @@
 {
-  "branches": ["main"],
+  "branches": ["main", { "name": "next", "prerelease": true }],
   "dryRun": false,
   "ci": true,
   "plugins": [