Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 29 additions & 19 deletions build/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 == 'master') {
sh '''
docker build -t $docker_server/$docker_repo:latest .
'''
} else if (env.BRANCH_NAME == 'staging'){
sh '''
docker build -t $docker_server/$docker_repo:staging .
'''
}
}

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 == 'master') {
sh '''
docker push $docker_server/$docker_repo:latest
'''
} else if (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 == 'master') {
build job: 'ULP/deploy-staging/ulp-bff/', parameters: [string(name: 'tag', value: 'latest')]
}
else if (env.BRANCH_NAME == 'staging'){
build job: 'UAT/deploy-uat/ulp-bff/', parameters: [string(name: 'tag', value: 'staging')]
}
}

}
3 changes: 2 additions & 1 deletion src/credentials/credentials.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down