From cb37a7f65299b497767ab0feb612bbb33dc0dd6d Mon Sep 17 00:00:00 2001 From: techno-376 Date: Thu, 2 May 2024 16:57:06 +0530 Subject: [PATCH 01/11] [DSD-4849] updated chart version to 0.0.1-SNAPSHOT Signed-off-by: techno-376 --- helm/esignet/Chart.yaml | 2 +- helm/esignet/install.sh | 4 ++-- helm/esignet/keycloak-init.sh | 2 +- helm/oidc-ui/Chart.yaml | 2 +- helm/oidc-ui/install.sh | 2 +- partner-onboarder/install.sh | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/helm/esignet/Chart.yaml b/helm/esignet/Chart.yaml index 37cb783b6..9db548698 100644 --- a/helm/esignet/Chart.yaml +++ b/helm/esignet/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: esignet description: A Helm chart for MOSIP esignet module type: application -version: 1.0.1 +version: 0.0.1-develop appVersion: "" dependencies: - name: common diff --git a/helm/esignet/install.sh b/helm/esignet/install.sh index 898efe2ef..abe11a76d 100755 --- a/helm/esignet/install.sh +++ b/helm/esignet/install.sh @@ -7,13 +7,13 @@ if [ $# -ge 1 ] ; then fi SOFTHSM_NS=softhsm -SOFTHSM_CHART_VERSION=12.0.2 +SOFTHSM_CHART_VERSION=0.0.1-develop echo Create $SOFTHSM_NS namespace kubectl create ns $SOFTHSM_NS NS=esignet -CHART_VERSION=1.0.1 +CHART_VERSION=0.0.1-develop ESIGNET_HOST=$(kubectl get cm global -o jsonpath={.data.mosip-esignet-host}) diff --git a/helm/esignet/keycloak-init.sh b/helm/esignet/keycloak-init.sh index 08750bb4e..33d27e027 100755 --- a/helm/esignet/keycloak-init.sh +++ b/helm/esignet/keycloak-init.sh @@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then fi NS=esignet -CHART_VERSION=12.0.1-B2 +CHART_VERSION=0.0.1-develop COPY_UTIL=../copy_cm_func.sh helm repo add mosip https://mosip.github.io/mosip-helm diff --git a/helm/oidc-ui/Chart.yaml b/helm/oidc-ui/Chart.yaml index 9cf547c48..7634ea9f1 100644 --- a/helm/oidc-ui/Chart.yaml +++ b/helm/oidc-ui/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: oidc-ui description: A Helm chart for MOSIP OIDC UI module type: application -version: 1.0.1 +version: 0.0.1-develop appVersion: "" dependencies: - name: common diff --git a/helm/oidc-ui/install.sh b/helm/oidc-ui/install.sh index 1d7f76dfd..92b51da1d 100755 --- a/helm/oidc-ui/install.sh +++ b/helm/oidc-ui/install.sh @@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then fi NS=esignet -CHART_VERSION=1.0.1 +CHART_VERSION=0.0.1-develop echo Create $NS namespace kubectl create ns $NS diff --git a/partner-onboarder/install.sh b/partner-onboarder/install.sh index 63fb71cca..80514b1d2 100755 --- a/partner-onboarder/install.sh +++ b/partner-onboarder/install.sh @@ -21,7 +21,7 @@ if [ "$flag" = "n" ]; then fi NS=esignet -CHART_VERSION=12.0.2 +CHART_VERSION=0.0.1-develop echo Create $NS namespace kubectl create ns $NS From 041ab8f38375c867282ff614c727de58476892ae Mon Sep 17 00:00:00 2001 From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com> Date: Fri, 3 May 2024 15:55:49 +0530 Subject: [PATCH 02/11] Update Chart.yaml Signed-off-by: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com> --- helm/esignet/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/esignet/Chart.yaml b/helm/esignet/Chart.yaml index 9db548698..650f08033 100644 --- a/helm/esignet/Chart.yaml +++ b/helm/esignet/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: esignet description: A Helm chart for MOSIP esignet module type: application -version: 0.0.1-develop +version: 1.0.1-develop appVersion: "" dependencies: - name: common From 55860d4eef403cc323c2ef4bcfe32650094559d3 Mon Sep 17 00:00:00 2001 From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com> Date: Fri, 3 May 2024 15:56:37 +0530 Subject: [PATCH 03/11] Update install.sh Signed-off-by: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com> --- helm/esignet/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/esignet/install.sh b/helm/esignet/install.sh index abe11a76d..949ad437d 100755 --- a/helm/esignet/install.sh +++ b/helm/esignet/install.sh @@ -13,7 +13,7 @@ echo Create $SOFTHSM_NS namespace kubectl create ns $SOFTHSM_NS NS=esignet -CHART_VERSION=0.0.1-develop +CHART_VERSION=1.0.1-develop ESIGNET_HOST=$(kubectl get cm global -o jsonpath={.data.mosip-esignet-host}) @@ -98,4 +98,4 @@ set -o errexit ## set -e : exit the script if any statement returns a non-true set -o nounset ## set -u : exit the script if you try to use an uninitialised variable set -o errtrace # trace ERR through 'time command' and other functions set -o pipefail # trace ERR through pipes -installing_esignet # calling function \ No newline at end of file +installing_esignet # calling function From 7550faa4b86f372b718ba3e4dfe30e4c8f90ff9d Mon Sep 17 00:00:00 2001 From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com> Date: Fri, 3 May 2024 15:57:19 +0530 Subject: [PATCH 04/11] Update Chart.yaml Signed-off-by: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com> --- helm/oidc-ui/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/oidc-ui/Chart.yaml b/helm/oidc-ui/Chart.yaml index 7634ea9f1..adb838a1a 100644 --- a/helm/oidc-ui/Chart.yaml +++ b/helm/oidc-ui/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: oidc-ui description: A Helm chart for MOSIP OIDC UI module type: application -version: 0.0.1-develop +version: 1.0.1-develop appVersion: "" dependencies: - name: common From 89acd1f0670217521cb7a397783dff1a6f85c968 Mon Sep 17 00:00:00 2001 From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com> Date: Fri, 3 May 2024 15:58:10 +0530 Subject: [PATCH 05/11] Update install.sh Signed-off-by: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com> --- helm/oidc-ui/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/oidc-ui/install.sh b/helm/oidc-ui/install.sh index 92b51da1d..e12f2351b 100755 --- a/helm/oidc-ui/install.sh +++ b/helm/oidc-ui/install.sh @@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then fi NS=esignet -CHART_VERSION=0.0.1-develop +CHART_VERSION=1.0.1-develop echo Create $NS namespace kubectl create ns $NS From a62b4eb5ccb3f8cd83b4bca24b1174a25941eb55 Mon Sep 17 00:00:00 2001 From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com> Date: Fri, 3 May 2024 19:31:18 +0530 Subject: [PATCH 06/11] Update Chart.yaml Signed-off-by: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com> --- helm/esignet/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/esignet/Chart.yaml b/helm/esignet/Chart.yaml index 650f08033..9db548698 100644 --- a/helm/esignet/Chart.yaml +++ b/helm/esignet/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: esignet description: A Helm chart for MOSIP esignet module type: application -version: 1.0.1-develop +version: 0.0.1-develop appVersion: "" dependencies: - name: common From babb32f08bf033529a74ea2bf8956d210436d01f Mon Sep 17 00:00:00 2001 From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com> Date: Fri, 3 May 2024 19:31:48 +0530 Subject: [PATCH 07/11] Update install.sh Signed-off-by: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com> --- helm/esignet/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/esignet/install.sh b/helm/esignet/install.sh index 949ad437d..b33ab19ff 100755 --- a/helm/esignet/install.sh +++ b/helm/esignet/install.sh @@ -13,7 +13,7 @@ echo Create $SOFTHSM_NS namespace kubectl create ns $SOFTHSM_NS NS=esignet -CHART_VERSION=1.0.1-develop +CHART_VERSION=0.0.1-develop ESIGNET_HOST=$(kubectl get cm global -o jsonpath={.data.mosip-esignet-host}) From 70ecf26d4fd973f34945440cedc8d0f37989fce7 Mon Sep 17 00:00:00 2001 From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com> Date: Fri, 3 May 2024 19:32:12 +0530 Subject: [PATCH 08/11] Update Chart.yaml Signed-off-by: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com> --- helm/oidc-ui/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/oidc-ui/Chart.yaml b/helm/oidc-ui/Chart.yaml index adb838a1a..7634ea9f1 100644 --- a/helm/oidc-ui/Chart.yaml +++ b/helm/oidc-ui/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: oidc-ui description: A Helm chart for MOSIP OIDC UI module type: application -version: 1.0.1-develop +version: 0.0.1-develop appVersion: "" dependencies: - name: common From 0d4bf722b6dbb05df14f4089a2c76e850c717580 Mon Sep 17 00:00:00 2001 From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com> Date: Fri, 3 May 2024 19:32:26 +0530 Subject: [PATCH 09/11] Update install.sh Signed-off-by: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com> --- helm/oidc-ui/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/oidc-ui/install.sh b/helm/oidc-ui/install.sh index e12f2351b..92b51da1d 100755 --- a/helm/oidc-ui/install.sh +++ b/helm/oidc-ui/install.sh @@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then fi NS=esignet -CHART_VERSION=1.0.1-develop +CHART_VERSION=0.0.1-develop echo Create $NS namespace kubectl create ns $NS From 621e228a8cf6f2015b802a015ef61a2e7cab77c0 Mon Sep 17 00:00:00 2001 From: VSIVAKALYAN Date: Sun, 5 May 2024 16:15:56 +0530 Subject: [PATCH 10/11] [DSD-5071] Setu for apitest-esignet 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 e0ea41b33..c8a4b17cb 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -103,3 +103,65 @@ jobs: ACTOR_DOCKER_HUB: ${{ secrets.ACTOR_DOCKER_HUB }} RELEASE_DOCKER_HUB: ${{ secrets.RELEASE_DOCKER_HUB }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + + build-maven-apitest-esignet: + uses: mosip/kattu/.github/workflows/maven-build.yml@master + with: + SERVICE_LOCATION: ./apitest + BUILD_ARTIFACT: apitest-esignet + 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_esignet: + 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-esignet + 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_esignet: + needs: build-maven-apitest-esignet + strategy: + matrix: + include: + - SERVICE_LOCATION: 'apitest' + SERVICE_NAME: 'apitest-esignet' + BUILD_ARTIFACT: 'apitest-esignet' + 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_esignet: + needs: build-maven-apitest-esignet + 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 }} \ No newline at end of file diff --git a/apitest/entrypoint.sh b/apitest/entrypoint.sh index b56500353..263d9c016 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-esignet-*-jar-with-dependencies.jar; diff --git a/apitest/pom.xml b/apitest/pom.xml index a74a96155..b3cc48ed0 100644 --- a/apitest/pom.xml +++ b/apitest/pom.xml @@ -6,8 +6,8 @@ apitest-esignet jar apitest-esignet - Parent project of MOSIP functional tests - https://github.com/mosip/mosip-functional-tests + Parent project of apitest-esignet + https://github.com/mosip/esignet 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/esignet HEAD - + + + Mosip + mosip.emailnotifier@gmail.com + io.mosip + https://github.com/mosip/esignet + + @@ -169,7 +176,7 @@ 3.0.7 6.11 1.13 - apitests-esignet-1.2.0.1-SNAPSHOT-jar-with-dependencies + apitest-esignet-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 aba1f74932b93020e3daab3d1c56e317edbb2e9a Mon Sep 17 00:00:00 2001 From: VSIVAKALYAN Date: Mon, 6 May 2024 14:45:22 +0530 Subject: [PATCH 11/11] [DSD-5071] Setup for apitest-esignet 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 b3cc48ed0..84dbc0e7e 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/esignet.git + scm:git:ssh://github.com:mosip/esignet.git https://github.com/mosip/esignet HEAD