Merge pull request #1338 from DFE-Digital/909-git-api-remove-old-paas…

…-environments [909] Remove paas Github environments
DFE-Digital · Jan 18, 2024 · 9dcccd5 · 9dcccd5
2 parents c801af5 + 0e21227
commit 9dcccd5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
@@ -72,7 +72,7 @@ jobs:
            azure-credentials: ${{ secrets.AZURE_CREDENTIALS }}
 
        - name: Slack Release Notification
-         if: steps.tag_id.outputs.release_id && github.event.inputs.environment == 'Production'
+         if: steps.tag_id.outputs.release_id && github.event.inputs.environment == 'production_aks'
          uses: rtCamp/action-slack-notify@master
          env:
            SLACK_COLOR:    ${{env.SLACK_SUCCESS}}

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -16,6 +16,11 @@ jobs:
       - name: set-up-environment
         uses: DFE-Digital/github-actions/set-up-environment@master
 
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+
       - uses: Azure/login@v1
         with:
            creds: ${{ secrets.AZURE_CREDENTIALS }}
@@ -38,7 +43,7 @@ jobs:
           dotnet-version: '7.0'
 
       - name: Install dotnet-sonarscanner
-        run:  dotnet tool install --global dotnet-sonarscanner --version 5.9.1
+        run:  dotnet tool install --global dotnet-sonarscanner --version 5.15.0
 
       - name: Install dependencies
         run:  dotnet restore
@@ -70,9 +75,9 @@ jobs:
             " \
             /d:sonar.verbose=true \
             /d:sonar.log.level="DEBUG"
-             dotnet build
-             dotnet test --no-build --logger:trx -e:CollectCoverage=true -e:CoverletOutputFormat=opencover
-             dotnet sonarscanner end /d:sonar.login="${{ steps.fetch-secrets.outputs.SONAR-TOKEN }}"
+          dotnet build
+          dotnet test --no-build --logger:trx -e:CollectCoverage=true -e:CoverletOutputFormat=opencover
+          dotnet sonarscanner end /d:sonar.login="${{ steps.fetch-secrets.outputs.SONAR-TOKEN }}"
 
       - name: Slack Notification
         if: failure() && github.ref == 'refs/heads/master'

diff --git a/.github/workflows/trello.yml b/.github/workflows/trello.yml
@@ -8,7 +8,7 @@ jobs:
     name: Link Trello card to this PR
     if: "!contains( 'dependabot[bot] snyk-bot' , github.actor )"
     runs-on: ubuntu-latest
-    environment: Development
+    environment: development_aks
     steps:
       - uses: Azure/login@v1
         with:

diff --git a/README.md b/README.md
@@ -117,15 +117,15 @@ The API is deployed to [AKS](https://github.com/DFE-Digital/teacher-services-clo
 
 | Environment             | ASP.NET Core Environment | URL                                                               |
 | ----------------------- | ------------------------ | ----------------------------------------------------------------- |
-| development (AKS)       | staging                  | https://getintoteachingapi-development.test.teacherservices.cloud/|
-| test (AKS)              | staging                  | https://getintoteachingapi-test.test.teacherservices.cloud/       |
-| production (AKS)        | production               | https://getintoteachingapi-production.teacherservices.cloud/      |
-| development (local)     | development              | localhost                                                         |
-| test (local)            | test                     | n/a                                                               |
+| development (AKS)       | Staging                  | https://getintoteachingapi-development.test.teacherservices.cloud/|
+| test (AKS)              | Staging                  | https://getintoteachingapi-test.test.teacherservices.cloud/       |
+| production (AKS)        | Production               | https://getintoteachingapi-production.teacherservices.cloud/      |
+| development (local)     | Development              | localhost                                                         |
+| test (local)            | Test                     | n/a                                                               |
 
 ### Process
 
-When you merge a branch to `master` it will automatically be deployed to the [development](#environments) and [test](#environments) environments via GitHub Actions and a tagged release will be created (the tag will use the PR number). You can then test the changes using the corresponding dev/test environments of the other GiT services. Once you're happy and want to ship to [production](#environments) you need to note the tag of your release and go to the `Manual Release` GitHub Action; from there you can select `Run workflow`, choose the `Production` environment and enter your release number.
+When you merge a branch to `master` it will automatically be deployed to the [development](#environments) and [test](#environments) environments via GitHub Actions and a tagged release will be created (the tag will use the PR number). You can then test the changes using the corresponding dev/test environments of the other GiT services. Once you're happy and want to ship to [production](#environments) you need to note the tag of your release and go to the `Manual Release` GitHub Action; from there you can select `Run workflow`, choose the `production_aks` environment and enter your release number.
 
 ### Rollbacks