From 6caa39313afeebde93416ca78ced51786df90085 Mon Sep 17 00:00:00 2001 From: Abhilash Dube Date: Wed, 3 May 2023 11:40:57 +0530 Subject: [PATCH 1/7] added some changes in Jenkinsfile --- build/Jenkinsfile | 48 ++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/build/Jenkinsfile b/build/Jenkinsfile index ade98cd..e74fd85 100644 --- a/build/Jenkinsfile +++ b/build/Jenkinsfile @@ -16,31 +16,41 @@ node() { } stage('docker-build') { - sh ''' - docker build -t $docker_server/$docker_repo:$commit_id . - ''' - if (env.BRANCH_NAME == 'staging') { - sh ''' - docker build -t $docker_server/$docker_repo:latest . - ''' - } + sh ''' + docker build -t $docker_server/$docker_repo:$commit_id . + ''' + if (env.BRANCH_NAME == 'main' || env.BRANCH_NAME == 'master') { + sh ''' + docker build -t $docker_server/$docker_repo:latest . + ''' + } else if (env.BRANCH_NAME == 'main' || env.BRANCH_NAME == 'staging'){ + sh ''' + docker build -t $docker_server/$docker_repo:latest . + ''' + } } stage('docker-push') { - sh ''' - docker push $docker_server/$docker_repo:$commit_id - ''' - if (env.BRANCH_NAME == 'staging') { - sh ''' - docker push $docker_server/$docker_repo:staging - ''' - } + sh ''' + docker push $docker_server/$docker_repo:$commit_id + ''' + if (env.BRANCH_NAME == 'main' || env.BRANCH_NAME == 'master') { + sh ''' + docker push $docker_server/$docker_repo:latest + ''' + } else if (env.BRANCH_NAME == 'main' || env.BRANCH_NAME == 'staging'){ + sh ''' + docker push $docker_server/$docker_repo:staging + ''' + } } stage('Start deploy job with latest tag') { - if (env.BRANCH_NAME == 'staging') { - build job: 'UAT/deploy-uat/ulp-bff/', parameters: [string(name: 'tag', value: 'staging')] + if (env.BRANCH_NAME == 'main' || env.BRANCH_NAME == 'master') { + build job: 'ULP/deploy-staging/ulp-bff/', parameters: [string(name: 'tag', value: 'latest')] } + else if (env.BRANCH_NAME == 'main' || env.BRANCH_NAME == 'staging'){ + build job: 'UAT/deploy-staging/uat-bff/', parameters: [string(name: 'tag', value: 'latest'')] + } } - } From 284dfc67d037540285e0e1c6dd5c30a7fbfae9a6 Mon Sep 17 00:00:00 2001 From: Abhilash Dube Date: Thu, 4 May 2023 16:16:51 +0530 Subject: [PATCH 2/7] Removed main and latest replace with staging --- build/Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build/Jenkinsfile b/build/Jenkinsfile index e74fd85..9c0ca13 100644 --- a/build/Jenkinsfile +++ b/build/Jenkinsfile @@ -19,13 +19,13 @@ node() { sh ''' docker build -t $docker_server/$docker_repo:$commit_id . ''' - if (env.BRANCH_NAME == 'main' || env.BRANCH_NAME == 'master') { + if (env.BRANCH_NAME == 'master') { sh ''' docker build -t $docker_server/$docker_repo:latest . ''' - } else if (env.BRANCH_NAME == 'main' || env.BRANCH_NAME == 'staging'){ + } else if (env.BRANCH_NAME == 'staging'){ sh ''' - docker build -t $docker_server/$docker_repo:latest . + docker build -t $docker_server/$docker_repo:staging . ''' } } @@ -34,11 +34,11 @@ node() { sh ''' docker push $docker_server/$docker_repo:$commit_id ''' - if (env.BRANCH_NAME == 'main' || env.BRANCH_NAME == 'master') { + if (env.BRANCH_NAME == 'master') { sh ''' docker push $docker_server/$docker_repo:latest ''' - } else if (env.BRANCH_NAME == 'main' || env.BRANCH_NAME == 'staging'){ + } else if (env.BRANCH_NAME == 'staging'){ sh ''' docker push $docker_server/$docker_repo:staging ''' @@ -50,7 +50,7 @@ node() { build job: 'ULP/deploy-staging/ulp-bff/', parameters: [string(name: 'tag', value: 'latest')] } else if (env.BRANCH_NAME == 'main' || env.BRANCH_NAME == 'staging'){ - build job: 'UAT/deploy-staging/uat-bff/', parameters: [string(name: 'tag', value: 'latest'')] + build job: 'UAT/deploy-staging/uat-bff/', parameters: [string(name: 'tag', value: 'staging'')] } } } From 0c1eed0e91420acefaed5471aa2218d2040276d0 Mon Sep 17 00:00:00 2001 From: Abhilash Dube Date: Mon, 8 May 2023 12:13:04 +0530 Subject: [PATCH 3/7] removed main from jekins file --- build/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Jenkinsfile b/build/Jenkinsfile index 9c0ca13..d543450 100644 --- a/build/Jenkinsfile +++ b/build/Jenkinsfile @@ -46,10 +46,10 @@ node() { } stage('Start deploy job with latest tag') { - if (env.BRANCH_NAME == 'main' || env.BRANCH_NAME == 'master') { + if (env.BRANCH_NAME == 'master') { build job: 'ULP/deploy-staging/ulp-bff/', parameters: [string(name: 'tag', value: 'latest')] } - else if (env.BRANCH_NAME == 'main' || env.BRANCH_NAME == 'staging'){ + else if (env.BRANCH_NAME == 'staging'){ build job: 'UAT/deploy-staging/uat-bff/', parameters: [string(name: 'tag', value: 'staging'')] } } From b772f272c35772215ee71d5d7d1de6535d8a5f08 Mon Sep 17 00:00:00 2001 From: Abhilash Dube Date: Tue, 9 May 2023 10:37:04 +0530 Subject: [PATCH 4/7] Fixed the typo error --- build/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Jenkinsfile b/build/Jenkinsfile index d543450..7952c36 100644 --- a/build/Jenkinsfile +++ b/build/Jenkinsfile @@ -50,7 +50,7 @@ node() { build job: 'ULP/deploy-staging/ulp-bff/', parameters: [string(name: 'tag', value: 'latest')] } else if (env.BRANCH_NAME == 'staging'){ - build job: 'UAT/deploy-staging/uat-bff/', parameters: [string(name: 'tag', value: 'staging'')] + build job: 'UAT/deploy-staging/uat-bff/', parameters: [string(name: 'tag', value: 'staging')] } } } From 55e2b33fbd32c07ff50c08368b6432bfcb760afd Mon Sep 17 00:00:00 2001 From: Suraj Date: Thu, 1 Jun 2023 10:40:49 +0530 Subject: [PATCH 5/7] test --- src/credentials/credentials.service.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/credentials/credentials.service.ts b/src/credentials/credentials.service.ts index ef2ca4a..bff7ce7 100644 --- a/src/credentials/credentials.service.ts +++ b/src/credentials/credentials.service.ts @@ -429,7 +429,8 @@ export class CredentialsService { } async rejectStudent(credentialPlayload: SingleCredentialDto, response: Response) { - console.log("rejectStudentV2") + //console.log("rejectStudentV2") + console.log("response 433", response) var payload = credentialPlayload var osid = payload.credentialSubject.osid; //let updateRes = await this.sbrcUpdate({ "claim_status": "rejected" }, 'StudentDetailV2', osid) From 98c2d2a075b516f6b4ea8b7ed67d57c4629813d6 Mon Sep 17 00:00:00 2001 From: AbhilashKD <124042593+AbhilashKD@users.noreply.github.com> Date: Thu, 1 Jun 2023 12:11:15 +0530 Subject: [PATCH 6/7] Update Jenkinsfile --- build/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Jenkinsfile b/build/Jenkinsfile index 7952c36..543680d 100644 --- a/build/Jenkinsfile +++ b/build/Jenkinsfile @@ -50,7 +50,7 @@ node() { build job: 'ULP/deploy-staging/ulp-bff/', parameters: [string(name: 'tag', value: 'latest')] } else if (env.BRANCH_NAME == 'staging'){ - build job: 'UAT/deploy-staging/uat-bff/', parameters: [string(name: 'tag', value: 'staging')] + build job: 'UAT/deploy-uat/uat-bff/', parameters: [string(name: 'tag', value: 'staging')] } } } From ecdcaff7d4accd3b3b66d5ccda94d15174360816 Mon Sep 17 00:00:00 2001 From: jona-r <85622529+jona-r@users.noreply.github.com> Date: Thu, 1 Jun 2023 12:18:04 +0530 Subject: [PATCH 7/7] Update Jenkinsfile --- build/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Jenkinsfile b/build/Jenkinsfile index 543680d..a92b56e 100644 --- a/build/Jenkinsfile +++ b/build/Jenkinsfile @@ -50,7 +50,7 @@ node() { build job: 'ULP/deploy-staging/ulp-bff/', parameters: [string(name: 'tag', value: 'latest')] } else if (env.BRANCH_NAME == 'staging'){ - build job: 'UAT/deploy-uat/uat-bff/', parameters: [string(name: 'tag', value: 'staging')] + build job: 'UAT/deploy-uat/ulp-bff/', parameters: [string(name: 'tag', value: 'staging')] } } }