Merge remote-tracking branch 'upstream/release-1.1.1-temp' into featu…

…re/merge-1.1.1 Signed-off-by: Zeeshan Mehboob <[email protected]>
Infosys · Jan 30, 2025 · c3b0d7d · c3b0d7d
1 parent 455484f
commit c3b0d7d
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 12 deletions.
diff --git a/.github/workflows/manual-docker-build.yml b/.github/workflows/manual-docker-build.yml
@@ -24,8 +24,8 @@ jobs:
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
 
   build_dockers_esignet_with_plugins:
-    needs: build_maven_signup_with_plugins
-    if: ${{ github.event_name == 'workflow_dispatch' }}  # Runs only when triggered manually
+    needs: [ build_maven_signup_with_plugins, check_snapshot_version, publish_to_nexus ]
+    if: ${{ needs.check_snapshot_version.outputs.is_condition == 'true' }}
     strategy:
       matrix:
         include:

diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml
@@ -221,7 +221,7 @@ jobs:
     secrets:
       OSSRH_USER: ${{ secrets.OSSRH_USER }}
       OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
-      OSSRH_URL: ${{ secrets.RELEASE_URL }}
+      OSSRH_URL: ${{ secrets.OSSRH_SNAPSHOT_URL }}
       OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
       GPG_SECRET: ${{ secrets.GPG_SECRET }}
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}

diff --git a/api-test/pom.xml b/api-test/pom.xml
@@ -49,7 +49,7 @@
 		<maven.source.plugin.version>2.2.1</maven.source.plugin.version>
 
 		<git.commit.id.plugin.version>3.0.1</git.commit.id.plugin.version>
-		<fileName>apitest-esignet-signup-1.1.0-jar-with-dependencies</fileName>
+		<fileName>apitest-esignet-signup-1.1.1-SNAPSHOT-jar-with-dependencies</fileName>
 	</properties>
 
 	<dependencies>

diff --git a/deploy/config-server/install.sh b/deploy/config-server/install.sh
@@ -14,7 +14,7 @@ set -o errtrace  # trace ERR through 'time command' and other functions
 set -o pipefail  # trace ERR through pipes
 
 NS=config-server
-CHART_VERSION=12.0.1
+CHART_VERSION=0.0.1-develop
 
     echo Create $NS namespace
     kubectl create ns $NS || true

diff --git a/deploy/init_values.yaml b/deploy/init_values.yaml
@@ -12,7 +12,7 @@ databases:
         key: postgres-password
     dml: 0
     repoUrl: https://github.com/mosip/audit-manager.git
-    branch: v1.2.0.1
+    branch: develop
   mosip_kernel:
     enabled: true
     host: "esignet-postgres.<sandbox>.mosip.net"
@@ -24,7 +24,7 @@ databases:
         key: postgres-password
     dml: 0
     repoUrl: https://github.com/mosip/commons.git
-    branch: v1.2.0.1
+    branch: develop
   mosip_otp:
     enabled: true
     host: "esignet-postgres.<sandbox>.mosip.net"
@@ -36,4 +36,4 @@ databases:
         key: postgres-password
     dml: 0
     repoUrl: https://github.com/mosip/otp-manager.git
-    branch: v1.2.0.1
+    branch: develop
diff --git a/deploy/mock-smtp/install.sh b/deploy/mock-smtp/install.sh
@@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then
 fi
 
 NS=mock-smtp
-CHART_VERSION=1.0.0
+CHART_VERSION=12.0.x-develop
 
 echo Create $NS namespace
 kubectl create ns $NS

diff --git a/deploy/postgres-init.sh b/deploy/postgres-init.sh
@@ -8,7 +8,7 @@ fi
 # Function to initialize the DB
 function initialize_db() {
   NS=signup
-  CHART_VERSION=12.0.1
+  CHART_VERSION=1.1.0-develop
   helm repo update
 
   # Confirm if the user wants to initialize DB scripts

diff --git a/helm/signup-service/values.yaml b/helm/signup-service/values.yaml
@@ -290,8 +290,6 @@ extraEnvVars: |
     value: fullName,phone,password,preferredLang
   - name: MOSIP_SIGNUP_MOCK_USERNAME_FIELD
     value: phone
-  - name: MOSIP_SIGNUP_SEND_CHALLENGE_CAPTCHA_REQUIRED
-    value: 'true'
   - name: MOSIP_SIGNUP_SUPPORTED_LANGUAGES
     value: '{''eng'',''khm''}'
   - name: MOSIP_SIGNUP_FULLNAME_PATTERN