Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/uat' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	helm-chart/Chart.yaml
#	pom.xml
#	src/test/resources/integration-test/output/result.html
#	src/test/resources/integration-test/output/result.json
  • Loading branch information
LuciaM1 committed Sep 20, 2024
2 parents 3afb4dd + ab19dac commit 896c4d3
Show file tree
Hide file tree
Showing 10 changed files with 700 additions and 39 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@67fbcbb121271f7775d2e7715933280b06314838
Expand All @@ -32,7 +32,7 @@ jobs:

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v2
uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076 # v2

- name: Build docker image
env:
Expand All @@ -52,12 +52,12 @@ jobs:
runs-on: ubuntu-latest
environment: ${{ matrix.environment }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

- name: Setup JDK
uses: graalvm/setup-graalvm@v1
uses: graalvm/setup-graalvm@2911b2304bee2c2f59b9a67bf45f025a6b6de4b1 # v1
with:
java-version: '21'
distribution: 'graalvm'
Expand All @@ -69,7 +69,7 @@ jobs:
- name: Create Status check based on postman results
id: process-postman
uses: im-open/[email protected]
uses: im-open/process-postman-test-results@4cc90df9ffdd1554366e19e759a15d008bdf3c39 # v2.1.5
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
results-file: src/test/resources/integration-test/output/result.json
Expand All @@ -87,14 +87,14 @@ jobs:
exit 1
- name: Upload result.html
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
with:
name: html-report
path: src/test/resources/integration-test/output/result.html

- name: JaCoCo Code Coverage Report
id: jacoco_reporter
uses: PavanMudigonda/[email protected]
uses: PavanMudigonda/jacoco-reporter@76044ebc031589dcbce0bb1048ffee1072a43f97 # v4.9
with:
coverage_results_path: target/jacoco-report/jacoco.xml
coverage_report_name: 'Coverage build ${{ github.run_number }}'
Expand All @@ -107,7 +107,7 @@ jobs:

- name: Fail Build if overall coverage is less than 90%
if: steps.jacoco_reporter.outputs.coverage_percentage < 90.0
uses: actions/github-script@v6
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
with:
script: |
core.setFailed('Overall coverage is less than 90%!')
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/jacoco.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
pull-requests: write
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2

- name: Setup JDK
uses: graalvm/setup-graalvm@v1
uses: graalvm/setup-graalvm@2911b2304bee2c2f59b9a67bf45f025a6b6de4b1 # v1
with:
java-version: '21'
distribution: 'graalvm'
Expand All @@ -36,7 +36,7 @@ jobs:

- name: Fail PR if overall coverage is less than 90%
if: ${{ steps.jacoco.outputs.coverage-overall < 90.0 }}
uses: actions/github-script@v6
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
with:
script: |
core.setFailed('Overall coverage is less than 90%!')
14 changes: 7 additions & 7 deletions .github/workflows/manual-create-pre-release-from-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@67fbcbb121271f7775d2e7715933280b06314838
Expand All @@ -42,10 +42,10 @@ jobs:

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v2
uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076 # v2

- name: Setup JDK
uses: graalvm/setup-graalvm@v1
uses: graalvm/setup-graalvm@2911b2304bee2c2f59b9a67bf45f025a6b6de4b1 # v1
with:
java-version: '21'
distribution: 'graalvm'
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
- name: Create Status check based on postman results
id: process-postman
uses: im-open/[email protected]
uses: im-open/process-postman-test-results@4cc90df9ffdd1554366e19e759a15d008bdf3c39 # v2.1.5
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
results-file: src/test/resources/integration-test/output/result.json
Expand All @@ -116,14 +116,14 @@ jobs:
exit 1
- name: Upload result.html
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
with:
name: html-report
path: src/test/resources/integration-test/output/result.html

- name: JaCoCo Code Coverage Report
id: jacoco_reporter
uses: PavanMudigonda/[email protected]
uses: PavanMudigonda/jacoco-reporter@76044ebc031589dcbce0bb1048ffee1072a43f97 # v4.9
with:
coverage_results_path: target/jacoco-report/jacoco.xml
coverage_report_name: 'Coverage create pre-release: ${{ github.run_number }}'
Expand All @@ -136,7 +136,7 @@ jobs:

- name: Fail Build if overall coverage is less than 90%
if: steps.jacoco_reporter.outputs.coverage_percentage < 90.0
uses: actions/github-script@v6
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
with:
script: |
core.setFailed('Overall coverage is less than 90%!')
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/manual-create-pre-release-from-hotfix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@67fbcbb121271f7775d2e7715933280b06314838
Expand All @@ -42,10 +42,10 @@ jobs:

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v2
uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076 # v2

- name: Setup JDK
uses: graalvm/setup-graalvm@v1
uses: graalvm/setup-graalvm@2911b2304bee2c2f59b9a67bf45f025a6b6de4b1 # v1
with:
java-version: '21'
distribution: 'graalvm'
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
- name: Create Status check based on postman results
id: process-postman
uses: im-open/[email protected]
uses: im-open/process-postman-test-results@4cc90df9ffdd1554366e19e759a15d008bdf3c39 # v2.1.5
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
results-file: src/test/resources/integration-test/output/result.json
Expand All @@ -116,14 +116,14 @@ jobs:
exit 1
- name: Upload result.html
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
with:
name: html-report
path: src/test/resources/integration-test/output/result.html

- name: JaCoCo Code Coverage Report
id: jacoco_reporter
uses: PavanMudigonda/[email protected]
uses: PavanMudigonda/jacoco-reporter@76044ebc031589dcbce0bb1048ffee1072a43f97 # v4.9
with:
coverage_results_path: target/jacoco-report/jacoco.xml
coverage_report_name: 'Coverage create pre-release: ${{ github.run_number }}'
Expand All @@ -136,7 +136,7 @@ jobs:

- name: Fail Build if overall coverage is less than 90%
if: steps.jacoco_reporter.outputs.coverage_percentage < 90.0
uses: actions/github-script@v6
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
with:
script: |
core.setFailed('Overall coverage is less than 90%!')
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/manual-deploy-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@67fbcbb121271f7775d2e7715933280b06314838
Expand All @@ -39,7 +39,7 @@ jobs:

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v2
uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076 # v2

- name: Verify if the tag is on ECR
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/manual-promote-release-in-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2

- name: Configure uat AWS Credentials
uses: aws-actions/configure-aws-credentials@67fbcbb121271f7775d2e7715933280b06314838
Expand All @@ -39,7 +39,7 @@ jobs:

- name: Login to uat Amazon ECR
id: login-ecr-uat
uses: aws-actions/amazon-ecr-login@v2
uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076 # v2

- name: Copy docker image from uat ECR
env:
Expand All @@ -57,7 +57,7 @@ jobs:

- name: Login to prod Amazon ECR
id: login-ecr-prod
uses: aws-actions/amazon-ecr-login@v2
uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076 # v2

- name: Push docker image in prod ECR
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/manual-promote-release-in-uat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2

- name: Commit with "${{ inputs.commit }}:" prefix
run: |
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:

- name: Login to dev Amazon ECR
id: login-ecr-dev
uses: aws-actions/amazon-ecr-login@v2
uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076 # v2

- name: Copy docker image from dev ECR
env:
Expand All @@ -127,7 +127,7 @@ jobs:

- name: Login to uat Amazon ECR
id: login-ecr-uat
uses: aws-actions/amazon-ecr-login@v2
uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076 # v2

- name: Push docker image in uat ECR
if: steps.semantic-release.outputs.new_release_published == 'true'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/performance-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2

- name: Run k6 local test
uses: grafana/[email protected]
uses: grafana/k6-action@e4714b734f2b0afaabeb7b4a69142745548ab9ec # v0.3.1
env:
MODEL_APPLICATION_BASE_URL: ${{ vars.APPLICATION_BASE_URL }}
MODEL_APPLICATION_BASE_PATH: ${{ vars.APPLICATION_BASE_PATH }}
Expand All @@ -35,7 +35,7 @@ jobs:

- name: Upload performance test file
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
with:
name: performance-report
path: performance_summary.html
Loading

0 comments on commit 896c4d3

Please sign in to comment.