From 9669310f98ba42f782a748bef89c07ceca39211b Mon Sep 17 00:00:00 2001 From: VSIVAKALYAN Date: Sun, 5 May 2024 17:13:13 +0530 Subject: [PATCH 1/2] [DSD-5071] Setup for apitest-auth Signed-off-by: VSIVAKALYAN --- .github/workflows/push-trigger.yml | 62 ++++++++++++++++++++++++++++++ apitest/entrypoint.sh | 2 +- apitest/pom.xml | 19 ++++++--- 3 files changed, 76 insertions(+), 7 deletions(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index a460d425a99..b52d57c0ba6 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -89,3 +89,65 @@ jobs: OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} GPG_SECRET: ${{ secrets.GPG_SECRET }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + + build-maven-apitest-auth: + uses: mosip/kattu/.github/workflows/maven-build.yml@master + with: + SERVICE_LOCATION: ./apitest + BUILD_ARTIFACT: apitest-auth + secrets: + 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 }} + + publish_to_nexus_apitest_auth: + 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-auth + uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master + with: + SERVICE_LOCATION: ./apitest + secrets: + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_URL: ${{ secrets.OSSRH_SNAPSHOT_URL }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + + build-dockers_apitest_auth: + needs: build-maven-apitest-auth + strategy: + matrix: + include: + - SERVICE_LOCATION: 'apitest' + SERVICE_NAME: 'apitest-auth' + BUILD_ARTIFACT: 'apitest-auth' + fail-fast: false + name: ${{ matrix.SERVICE_NAME }} + uses: mosip/kattu/.github/workflows/docker-build.yml@master + with: + SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }} + SERVICE_NAME: ${{ matrix.SERVICE_NAME }} + BUILD_ARTIFACT: ${{ matrix.BUILD_ARTIFACT }} + secrets: + DEV_NAMESPACE_DOCKER_HUB: ${{ secrets.DEV_NAMESPACE_DOCKER_HUB }} + ACTOR_DOCKER_HUB: ${{ secrets.ACTOR_DOCKER_HUB }} + RELEASE_DOCKER_HUB: ${{ secrets.RELEASE_DOCKER_HUB }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + + sonar_analysis_apitest_auth: + needs: build-maven-apitest-auth + if: "${{ github.event_name != 'pull_request' }}" + uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master + with: + SERVICE_LOCATION: ./apitest + 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 }} diff --git a/apitest/entrypoint.sh b/apitest/entrypoint.sh index b5650035359..d6c99fcd02d 100644 --- a/apitest/entrypoint.sh +++ b/apitest/entrypoint.sh @@ -1,4 +1,4 @@ #!/bin/bash ## Run automationtests -java -jar -Dmodules="$MODULES" -Denv.user="$ENV_USER" -Denv.endpoint="$ENV_ENDPOINT" -Denv.testLevel="$ENV_TESTLEVEL" automationtests.jar; +java -jar -Dmodules="$MODULES" -Denv.user="$ENV_USER" -Denv.endpoint="$ENV_ENDPOINT" -Denv.testLevel="$ENV_TESTLEVEL" apitest-auth-*-jar-with-dependencies.jar; diff --git a/apitest/pom.xml b/apitest/pom.xml index aa432b69452..30fb63f8a4f 100644 --- a/apitest/pom.xml +++ b/apitest/pom.xml @@ -6,8 +6,8 @@ apitest-auth jar apitest-auth - Parent project of MOSIP functional tests - https://github.com/mosip/mosip-functional-tests + Parent project of apitest-auth + https://github.com/mosip/id-authentication 1.2.0.1-SNAPSHOT @@ -20,11 +20,18 @@ scm:git:git://github.com/mosip/mosip-functional-tests.git scm:git:ssh://github.com:mosip/mosip-functional-tests.git - https://github.com/mosip/mosip-functional-tests + https://github.com/mosip/id-authentication HEAD - + + + Mosip + mosip.emailnotifier@gmail.com + io.mosip + https://github.com/mosip/id-authentication + + @@ -169,7 +176,7 @@ 3.0.7 6.11 1.13 - apitests-auth-1.2.0.1-SNAPSHOT-jar-with-dependencies + apitest-auth-1.2.0.1-SNAPSHOT-jar-with-dependencies @@ -380,7 +387,7 @@ io.mosip.testrig.apirig.automationtests.commons - automationtests-commons + apitest-commons 1.2.0.1-SNAPSHOT From fd25682c938195901f32f2a433116047b9d13fdd Mon Sep 17 00:00:00 2001 From: VSIVAKALYAN Date: Mon, 6 May 2024 14:47:11 +0530 Subject: [PATCH 2/2] [DSD-5071] Setup for apitest-auth Signed-off-by: VSIVAKALYAN --- apitest/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apitest/pom.xml b/apitest/pom.xml index 30fb63f8a4f..6c461170f00 100644 --- a/apitest/pom.xml +++ b/apitest/pom.xml @@ -18,8 +18,8 @@ - scm:git:git://github.com/mosip/mosip-functional-tests.git - scm:git:ssh://github.com:mosip/mosip-functional-tests.git + scm:git:git://github.com/mosip/id-authentication.git + scm:git:ssh://github.com:mosip/id-authentication.git https://github.com/mosip/id-authentication HEAD