Merge remote-tracking branch 'upstream/develop' into develop

Sohandey · Dec 4, 2023 · 80372bf · 80372bf
2 parents e8f866b + 0846bcd
commit 80372bf
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 18 deletions.
diff --git a/.github/workflows/authdemo-push-trigger.yml b/.github/workflows/authdemo-push-trigger.yml
@@ -83,4 +83,8 @@ jobs:
       OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
       OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
       GPG_SECRET: ${{ secrets.GPG_SECRET }}
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+
+  build-automation-tests:
+    needs: publish_to_nexus
+    uses: ./.github/workflows/automationtests-push-trigger.yml
diff --git a/.github/workflows/automationtests-push-trigger.yml b/.github/workflows/automationtests-push-trigger.yml
@@ -1,25 +1,26 @@
 name: Maven Package upon a push
 
 on:
-  release:
-    types: [published]
-  pull_request:
-    types: [opened, reopened, synchronize]
+  workflow_call:
   workflow_dispatch:
     inputs:
       message:
         description: 'Message for manually triggering'
         required: false
         default: 'Triggered for Updates'
         type: string
-  push:
-    branches:
-      - '!release-branch'
-      - master
-      - 1.*
-      - develop
-      - MOSIP*
-      - release*
+  #release:
+  #  types: [published]
+  #pull_request:
+  #  types: [opened, reopened, synchronize]
+  #push:
+  #  branches:
+  #    - '!release-branch'
+  #    - master
+  #    - 1.*
+  #    - develop
+  #    - MOSIP*
+  #    - release*
 
 jobs:
   build-maven-automationtests:

diff --git a/authentication-demo-service/pom.xml b/authentication-demo-service/pom.xml
@@ -4,7 +4,7 @@
 
 
 	<groupId>io.mosip.testrig.authentication.demo</groupId>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.1-develop-SNAPSHOT</version>
 	<artifactId>authentication-demo-service</artifactId>
 	<name>authentication-demo-service</name>
 	<packaging>jar</packaging>

diff --git a/automationtests/pom.xml b/automationtests/pom.xml
@@ -7,7 +7,7 @@
 	<packaging>jar</packaging>
 	<name>mosip-functional-test</name>
 	<url>http://maven.apache.org</url>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.1-develop-SNAPSHOT</version>
 
 	<licenses>
 		<license>
@@ -186,7 +186,7 @@
 		<rest.assured.version>3.0.7</rest.assured.version>
 		<testng.version>6.11</testng.version>
 		<zt.zip.version>1.13</zt.zip.version>
-		<fileName>automationtests-1.2.1-SNAPSHOT-jar-with-dependencies</fileName>
+		<fileName>automationtests-1.2.1-develop-SNAPSHOT-jar-with-dependencies</fileName>
 
 	</properties>
 	<dependencies>
@@ -461,7 +461,7 @@
 	 	<dependency>
 			<groupId>io.mosip.testrig.authentication.demo</groupId>
 			<artifactId>authentication-demo-service</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.2.1-develop-SNAPSHOT</version>
 			<exclusions>
 				<exclusion>
 					<groupId>dom4j</groupId>

diff --git a/automationtests/src/main/java/io/mosip/testrig/apirig/kernel/util/ConfigManager.java b/automationtests/src/main/java/io/mosip/testrig/apirig/kernel/util/ConfigManager.java
@@ -67,6 +67,7 @@ public class ConfigManager {
 	private static String S3_USER_KEY = "s3-user-key";
 	private static String S3_SECRET_KEY = "s3-user-secret";
 	private static String S3_ACCOUNT = "s3-account";
+	private static String S3_ACCOUNT_FOR_PERSONA_DATA = "s3-account-for-persona-data";
 	private static String PUSH_TO_S3 = "push-reports-to-s3";
 	private static String ENABLE_DEBUG = "enableDebug";
 	private static String THREAD_COUNT = "threadCount";
@@ -183,6 +184,7 @@ public class ConfigManager {
 	private static String s3Host;
 	private static String s3UserKey;
 	private static String s3Account;
+	private static String s3AccountForPersonaData;
 	private static String s3SecretKey;
 	private static String push_reports_to_s3;
 	private static String enableDebug;
@@ -291,6 +293,7 @@ public static void init() {
 		s3UserKey = getValueForKey(S3_USER_KEY);
 		s3SecretKey = getValueForKey(S3_SECRET_KEY);
 		s3Account = getValueForKey(S3_ACCOUNT);
+		s3AccountForPersonaData = getValueForKey(S3_ACCOUNT_FOR_PERSONA_DATA);
 		dbPort = getValueForKey(DB_PORT);
 		dbDomain = getValueForKey(DB_DOMAIN);
 		hibernateConnectionDriverClass = getValueForKey(HIBERNATE_CONNECTION_DRIVER_CLASS);
@@ -678,6 +681,10 @@ public static String getS3SecretKey() {
 	public static String getS3Account() {
 		return s3Account;
 	}
+
+	public static String getS3AccountForPersonaData() {
+		return s3AccountForPersonaData;
+	}
 
 	public static String getPushReportsToS3() {
 		return push_reports_to_s3;

diff --git a/automationtests/src/main/resources/config/Kernel.properties b/automationtests/src/main/resources/config/Kernel.properties
@@ -203,6 +203,7 @@ s3-host=http://minio.minio:9000
 s3-account=automation
 s3-region=null
 reportExpirationInDays=3
+s3-account-for-persona-data=personaData
 # supported values yes or no
 push-reports-to-s3=yes
 enableDebug=yes

diff --git a/automationtests/src/main/resources/ida/AddIdentity/AddIdentity.yml b/automationtests/src/main/resources/ida/AddIdentity/AddIdentity.yml
@@ -26,6 +26,34 @@ AddIdentity:
 }'
       output: '{
   "status":"ACTIVATED"
+}'
+   auth_AddIdentity_withValidParameters_new_uin_smoke_Pos:
+      endPoint: /idrepository/v1/identity/
+      role: idrepo
+      restMethod: post
+      inputTemplate: ida/AddIdentity/addIdentity_$LANGNUMBER$
+      outputTemplate: ida/AddIdentity/addIdentityResult
+      input: '{
+  "value": "$BIOVALUE$",
+  "id": "mosip.id.create",
+  "registrationId": "$RID$",
+  "addressCopy": "Y",
+  "biometricReferenceId": "23452353",
+   "UIN": "$UIN$",
+  "dateOfBirth": "1970/07/08",
+  "postalCode": "14022",
+  "email": "[email protected]",
+  "phone": "7019858531",
+  "mobileno": "7019858531",
+  "referenceIdentityNumber": "6789545678878",
+  "version": "v1",
+   "introducerRID": "212124324784879",
+   "introducerUIN": "212124324784879",
+   "category": "individualBiometrics",
+   "requesttime": "$TIMESTAMP$"
+}'
+      output: '{
+  "status":"ACTIVATED"
 }'
    auth_AddIdentity_withValidParameters_Infant_smoke_Pos:
       endPoint: /idrepository/v1/identity/
@@ -1052,4 +1080,4 @@ AddIdentity:
 }'
       output: '{
   "status":"ACTIVATED"
-}'
+}'