You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by dg...@apache.org on 2021/10/08 22:48:49 UTC
[openwhisk] branch asf-jenkins-test updated: take 2
This is an automated email from the ASF dual-hosted git repository.
dgrove pushed a commit to branch asf-jenkins-test
in repository https://gitbox.apache.org/repos/asf/openwhisk.git
The following commit(s) were added to refs/heads/asf-jenkins-test by this push:
new 582b424 take 2
582b424 is described below
commit 582b4241939050d13add19734dee4cb9441b939f
Author: David Grove <gr...@us.ibm.com>
AuthorDate: Fri Oct 8 18:48:34 2021 -0400
take 2
---
tools/jenkins/apache/dockerhub.groovy | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/jenkins/apache/dockerhub.groovy b/tools/jenkins/apache/dockerhub.groovy
index 6273cbb..6ff1c59 100644
--- a/tools/jenkins/apache/dockerhub.groovy
+++ b/tools/jenkins/apache/dockerhub.groovy
@@ -26,16 +26,16 @@ node('ubuntu') {
stage("Build and Deploy to DockerHub") {
def JAVA_JDK_8=tool name: 'jdk_1.8_latest', type: 'hudson.model.JDK'
withEnv(["Path+JDK=$JAVA_JDK_8/bin","JAVA_HOME=$JAVA_JDK_8"]) {
- sh "mkdir local-docker-cfg"
+ sh "mkdir $WORKSPACE/local-docker-cfg"
withCredentials([usernamePassword(credentialsId: 'openwhisk_dockerhub', passwordVariable: 'DOCKER_PASSWORD', usernameVariable: 'DOCKER_USER')]) {
- sh "HOME=\"$PWD/local-docker-cfg\" docker login -u ${DOCKER_USER} -p ${DOCKER_PASSWORD}"
+ sh 'HOME="$WORKSPACE/local-docker-cfg" docker login -u ${DOCKER_USER} -p ${DOCKER_PASSWORD}'
}
def PUSH_CMD = "./gradlew :core:controller:distDocker :core:invoker:distDocker :core:standalone:distDocker :core:monitoring:user-events:distDocker :tools:ow-utils:distDocker :core:cosmos:cache-invalidator:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk"
def gitCommit = sh(returnStdout: true, script: 'git rev-parse HEAD').trim()
def shortCommit = gitCommit.take(7)
sh "./gradlew clean"
- sh "HOME=\"$PWD/local-docker-cfg\" ${PUSH_CMD} -PdockerImageTag=nightly"
- sh "HOME=\"$PWD/local-docker-cfg\" ${PUSH_CMD} -PdockerImageTag=${shortCommit}"
+ sh "HOME=\"$WORKSPACE/local-docker-cfg\" ${PUSH_CMD} -PdockerImageTag=nightly"
+ sh "HOME=\"$WORKSPACE/local-docker-cfg\" ${PUSH_CMD} -PdockerImageTag=${shortCommit}"
}
}
@@ -44,7 +44,7 @@ node('ubuntu') {
sh 'docker rmi -f $(docker images -f "reference=openwhisk/*" -q) || true'
sh "docker images"
sh "docker logout"
- sh "rm -rf local-docker-cfg"
+ sh "rm -rf $WORKSPACE/local-docker-cfg"
}
stage("Notify") {