From aa05541a883b31b83437e87ae937e5c68976d72d Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Thu, 26 Oct 2023 18:41:20 -0400 Subject: [PATCH] Update the gradle check with docker command checks (#4178) Signed-off-by: Peter Zhu --- jenkins/gradle/gradle-check.jenkinsfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jenkins/gradle/gradle-check.jenkinsfile b/jenkins/gradle/gradle-check.jenkinsfile index 4872394953..8778dd920a 100644 --- a/jenkins/gradle/gradle-check.jenkinsfile +++ b/jenkins/gradle/gradle-check.jenkinsfile @@ -7,7 +7,7 @@ * compatible open source license. */ -lib = library(identifier: 'jenkins@1.1.2', retriever: modernSCM([ +lib = library(identifier: 'jenkins@5.3.0', retriever: modernSCM([ $class: 'GitSCMSource', remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git', ])) @@ -105,7 +105,8 @@ pipeline { echo("Build Cause: ${BUILD_CAUSE}") withCredentials([usernamePassword(credentialsId: CREDENTIAL_ID, usernameVariable: 'DOCKER_USERNAME', passwordVariable: 'DOCKER_PASSWORD')]) { - def dockerLogin = sh(returnStdout: true, script: "set +x && echo $DOCKER_PASSWORD | docker login --username $DOCKER_USERNAME --password-stdin").trim() + + def dockerLogin = sh(returnStdout: true, script: "set +x && (echo $DOCKER_PASSWORD | docker login --username $DOCKER_USERNAME --password-stdin) || echo docker error").trim() if (!env.BUILD_CAUSE.contains('Started by user') && !env.BUILD_CAUSE.contains('Started by timer')) { def pr_url = "${pr_to_clone_url}".replace(".git", "/pull/${pr_number}") @@ -133,7 +134,7 @@ pipeline { ) } - sh("docker logout") + sh("docker logout || echo docker error") } } } @@ -157,7 +158,7 @@ pipeline { always { script { postCleanup() - sh "docker logout && docker image prune -f --all" + sh "(docker logout && docker image prune -f --all) || echo docker error" } } }