This is an automated email from the ASF dual-hosted git repository.
jstastnycz pushed a commit to branch radtriste-fix-pipelines
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-images.git
The following commit(s) were added to refs/heads/radtriste-fix-pipelines by
this push:
new 9dc63bb1 small tweaks
9dc63bb1 is described below
commit 9dc63bb1b5f5ea1d844892847bf5d366f8bd32b4
Author: jstastny-cz <[email protected]>
AuthorDate: Thu Nov 16 07:29:30 2023 +0100
small tweaks
---
.ci/jenkins/Jenkinsfile.build-image | 2 +-
scripts/build-kogito-apps-components.sh | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.build-image
b/.ci/jenkins/Jenkinsfile.build-image
index 2051bdab..889cb831 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -107,7 +107,7 @@ pipeline {
// Build multiplatform from generated Dockerfile
String squashMessage =
"${getBuildImageName()}:${getImageVersion()} squashed"
dir('target/image') {
-
cloud.dockerBuildMultiPlatformImages(getBuiltImageTag(),
getImageBuildPlatforms(), shouldDeployImage(), squashMessage)
+
cloud.dockerBuildMultiPlatformImages(getBuiltImageTag(),
getImageBuildPlatforms(), shouldDeployImage(), squashMessage, false, true)
}
}
}
diff --git a/scripts/build-kogito-apps-components.sh
b/scripts/build-kogito-apps-components.sh
index 486dda8c..9c77acbe 100755
--- a/scripts/build-kogito-apps-components.sh
+++ b/scripts/build-kogito-apps-components.sh
@@ -9,6 +9,7 @@ set -e
set -o pipefail
KOGITO_APPS_REPO_NAME="incubator-kie-kogito-apps"
+KOGITO_APPS_FOLDER_NAME="kogito-apps"
# Read entries before sourcing
imageName="${1}"
@@ -115,12 +116,13 @@ for ctx in ${contextDir}; do
cd ${build_target_dir}
echo "Using branch/tag ${gitBranch}, checking out. Temporary build dir is
${build_target_dir} and target dist is ${target_tmp_dir}"
- if [ ! -d "${build_target_dir}/${KOGITO_APPS_REPO_NAME}" ]; then
- git_command="git clone --single-branch --branch ${gitBranch} --depth 1
${gitUri}"
+ KOGITO_APPS_DIR=${build_target_dir}/${KOGITO_APPS_FOLDER_NAME}
+ if [ ! -d "${KOGITO_APPS_DIR}" ]; then
+ git_command="git clone --single-branch --branch ${gitBranch} --depth 1
${gitUri} ${KOGITO_APPS_DIR}"
echo "cloning ${KOGITO_APPS_REPO_NAME} with the following git command:
${git_command}"
eval ${git_command}
fi
- cd ${KOGITO_APPS_REPO_NAME} && echo "working dir `pwd`"
+ cd ${KOGITO_APPS_DIR} && echo "working dir `pwd`"
echo "Got MAVEN_OPTIONS = ${MAVEN_OPTIONS}"
mvn_command="mvn -am -pl ${ctx} package ${MAVEN_OPTIONS}
-Dmaven.repo.local=${mvn_local_repo} -Dquarkus.container-image.build=false"
echo "Building component(s) ${contextDir} with the following maven command
[${mvn_command}]"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
