From 6f3a56302f4c87fd6a5bdf772333fa64bc2b7566 Mon Sep 17 00:00:00 2001 From: "Mahesh.Binayak" Date: Mon, 25 Nov 2024 13:41:26 +0530 Subject: [PATCH 1/6] [MOSIP-37805] Tetsing push-trigger to show both modules in sonar cloud Signed-off-by: Mahesh.Binayak --- .github/workflows/push-trigger.yml | 47 +++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index 947301dd39..c067138e67 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -188,17 +188,36 @@ jobs: RELEASE_DOCKER_HUB: ${{ secrets.RELEASE_DOCKER_HUB }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - sonar_analysis_apitest_prereg: - needs: build-maven-apitest-prereg - if: "${{ github.event_name != 'pull_request' }}" - uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21 - with: - SERVICE_LOCATION: ./api-test - secrets: - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - ORG_KEY: ${{ secrets.ORG_KEY }} - OSSRH_USER: ${{ secrets.OSSRH_USER }} - OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} - OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} - GPG_SECRET: ${{ secrets.GPG_SECRET }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} \ No newline at end of file + sonar_analysis_for_prereg_and_testrig: + name: Sonar Analysis for Pre-Reg and Test Rig + needs: + - build-maven-pre-registration + - build-maven-apitest-prereg + if: "${{ github.event_name != 'pull_request' }}" + runs-on: ubuntu-latest + steps: + - name: Sonar Analysis for Pre-Registration + uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21 + with: + SERVICE_LOCATION: ./pre-registration + secrets: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + ORG_KEY: ${{ secrets.ORG_KEY }} + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + + - name: Sonar Analysis for API Test Rig + uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21 + with: + SERVICE_LOCATION: ./api-test + secrets: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + ORG_KEY: ${{ secrets.ORG_KEY }} + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} From fa55ddbc562007c8542f4cd5e438e59351e8a824 Mon Sep 17 00:00:00 2001 From: "Mahesh.Binayak" Date: Mon, 25 Nov 2024 13:47:53 +0530 Subject: [PATCH 2/6] [MOSIP-37805] Tetsing push-trigger to show both modules in sonar cloud Signed-off-by: Mahesh.Binayak --- .github/workflows/push-trigger.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index c067138e67..93c3ef76dc 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -78,20 +78,7 @@ jobs: RELEASE_DOCKER_HUB: ${{ secrets.RELEASE_DOCKER_HUB }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - sonar_analysis: - needs: build-maven-pre-registration - if: "${{ github.event_name != 'pull_request' }}" - uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21 - with: - SERVICE_LOCATION: ./pre-registration - secrets: - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - ORG_KEY: ${{ secrets.ORG_KEY }} - OSSRH_USER: ${{ secrets.OSSRH_USER }} - OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} - OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} - GPG_SECRET: ${{ secrets.GPG_SECRET }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + build-maven-apitest-prereg: uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21 From 698c66fa8909acda37735e2892720e20eb43ae1d Mon Sep 17 00:00:00 2001 From: Mahesh-Binayak <76687012+mahesh-binayak@users.noreply.github.com> Date: Mon, 25 Nov 2024 17:19:06 +0530 Subject: [PATCH 3/6] [MOSIP-37805] Tetsing push-trigger to show both modules in sonar cloud Signed-off-by: Mahesh.Binayak --- .github/workflows/push-trigger.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index 947301dd39..f4f504096e 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -81,7 +81,7 @@ jobs: sonar_analysis: needs: build-maven-pre-registration if: "${{ github.event_name != 'pull_request' }}" - uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21 + uses: mosip/kattu/.github/workflows/maven-sonar-analysis-new.yml@master-java21 with: SERVICE_LOCATION: ./pre-registration secrets: @@ -191,7 +191,7 @@ jobs: sonar_analysis_apitest_prereg: needs: build-maven-apitest-prereg if: "${{ github.event_name != 'pull_request' }}" - uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21 + uses: mosip/kattu/.github/workflows/maven-sonar-analysis-new.yml@master-java21 with: SERVICE_LOCATION: ./api-test secrets: From 7f3202ce985662489e5ad5f7ee42c8705000047b Mon Sep 17 00:00:00 2001 From: Mahesh-Binayak <76687012+mahesh-binayak@users.noreply.github.com> Date: Tue, 26 Nov 2024 10:49:42 +0530 Subject: [PATCH 4/6] [MOSIP-37805] Testing push-trigger to show both modules in sonar cloud Signed-off-by: Mahesh.Binayak --- .github/workflows/push-trigger.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index f4f504096e..a83d494cfb 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -81,7 +81,7 @@ jobs: sonar_analysis: needs: build-maven-pre-registration if: "${{ github.event_name != 'pull_request' }}" - uses: mosip/kattu/.github/workflows/maven-sonar-analysis-new.yml@master-java21 + uses: mosip/kattu/.github/workflows/maven-sonar-analysis-new.yml@develop with: SERVICE_LOCATION: ./pre-registration secrets: @@ -108,7 +108,7 @@ jobs: publish_to_nexus_apitest_prereg: if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' && github.event_name != 'release' && github.event_name != 'prerelease' && github.event_name != 'publish' }}" needs: build-maven-apitest-prereg - uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master-java21 + uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@develop with: SERVICE_LOCATION: ./api-test secrets: From f0053cc4b0e0e60a470b51d3f65ba8324792f833 Mon Sep 17 00:00:00 2001 From: Mahesh-Binayak <76687012+Mahesh-Binayak@users.noreply.github.com> Date: Tue, 26 Nov 2024 10:55:08 +0530 Subject: [PATCH 5/6] Update push-trigger.yml --- .github/workflows/push-trigger.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index a83d494cfb..2d1a219a38 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -108,7 +108,7 @@ jobs: publish_to_nexus_apitest_prereg: if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' && github.event_name != 'release' && github.event_name != 'prerelease' && github.event_name != 'publish' }}" needs: build-maven-apitest-prereg - uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@develop + uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master-java21 with: SERVICE_LOCATION: ./api-test secrets: @@ -191,7 +191,7 @@ jobs: sonar_analysis_apitest_prereg: needs: build-maven-apitest-prereg if: "${{ github.event_name != 'pull_request' }}" - uses: mosip/kattu/.github/workflows/maven-sonar-analysis-new.yml@master-java21 + uses: mosip/kattu/.github/workflows/maven-sonar-analysis-new.yml@develop with: SERVICE_LOCATION: ./api-test secrets: @@ -201,4 +201,4 @@ jobs: OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} GPG_SECRET: ${{ secrets.GPG_SECRET }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} \ No newline at end of file + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} From 6d44acf7ea3723e2ef92981d8ec3d5dbd9b5e9b3 Mon Sep 17 00:00:00 2001 From: Mahesh-Binayak <76687012+Mahesh-Binayak@users.noreply.github.com> Date: Tue, 26 Nov 2024 11:34:15 +0530 Subject: [PATCH 6/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 966892e1c6..5c8346a772 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # Pre-registration This repository contains the source code and design documents for MOSIP Pre-registration server. For an overview refer [here](https://docs.mosip.io/1.2.0/modules/pre-registration). The modules exposes API endpoints. For a reference front-end UI implementation refer to [Pre-registration UI github repo](https://github.com/mosip/pre-registration-ui/). Pre-registration Developers Guide [here](https://docs.mosip.io/1.2.0/modules/pre-registration/pre-registration-developer-setup) -Pre-registration module consists of the following services: +Pre-registration module consists of the following services : 1. Application 2. Booking 3. Batchjob