You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2022/01/05 17:17:55 UTC
[hop] branch 2.0.0 updated: fix docker images
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch 2.0.0
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/2.0.0 by this push:
new 2ebe6d6 fix docker images
new ab1c775 Merge pull request #1258 from hansva/2.0.0
2ebe6d6 is described below
commit 2ebe6d61a1fb87a05549d93f11cb79c5f1f125a4
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Wed Jan 5 18:17:04 2022 +0100
fix docker images
---
Jenkinsfile | 1 -
Jenkinsfile.daily | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 2cd45df..0fbe70e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -135,7 +135,6 @@ pipeline {
//TODO We may never create final/latest version using CI/CD as we need to follow manual apache release process with signing
sh "docker build . -f docker/Dockerfile -t ${DOCKER_REPO}:${env.POM_VERSION}"
sh "docker push --all-tags ${DOCKER_REPO}"
- sh "docker rmi ${DOCKER_REPO}:Development"
sh "docker rmi ${DOCKER_REPO}:${env.POM_VERSION}"
}
}
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 9467254..1211645 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -18,7 +18,7 @@
*/
def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
-def JDK_NAME = env.JDK_NAME ?: 'jdk_1.8_latest'
+def JDK_NAME = env.JDK_NAME ?: 'jdk_11_latest'
def MAVEN_NAME = env.MAVEN_NAME ?: 'maven_3_latest'
def MAVEN_PARAMS = "-T 2 -U -B -e -fae -V -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2"