Skip to content

Commit

Permalink
[KOGITO-8472] - Images: Maven modules should have a common configure …
Browse files Browse the repository at this point in the history
…script

Signed-off-by: Spolti <[email protected]>
  • Loading branch information
spolti committed Sep 29, 2023
1 parent 5fac5e9 commit f1026a9
Show file tree
Hide file tree
Showing 16 changed files with 129 additions and 465 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ ifneq ($(ignore_build),true)
endif
# if ignore_test is set to true, ignore the tests
ifneq ($(ignore_test),true)
scripts/build-product-image.sh "test" $(image_name) ${test_options}
scripts/build-product-image.sh "test" $(image_name) ${test_options} ${BUILD_ENGINE}
endif

# push images to quay.io, this requires permissions under kiegroup organization
Expand Down
2 changes: 1 addition & 1 deletion modules/kogito-dynamic-resources/configure
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
set -e

SCRIPT_DIR=$(dirname "$0")
SCRIPT_DIR=$(dirname "${0}")

mkdir -p "${JBOSS_CONTAINER_JAVA_JVM_MODULE}"

Expand Down
253 changes: 0 additions & 253 deletions modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh

This file was deleted.

6 changes: 1 addition & 5 deletions modules/kogito-maven/3.8.x-rpm/configure
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@ set -e
SOURCES_DIR=/tmp/artifacts
SCRIPT_DIR=$(dirname "${0}")

mkdir "${KOGITO_HOME}"/.m2
cp -v "${SCRIPT_DIR}"/maven/* "${KOGITO_HOME}"/.m2
cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/

# configure Red Hat repositories on the maven settings.xml for product builds
if [ "${ENABLE_RH_MAVEN_REPO}" == "true" ]; then
if [ "${ENABLE_RH_MAVEN_REPO}" = "true" ]; then
echo "enabling red hat repositories"
rh_repos=" <!-- JBoss EAP Maven repository -->\
<profile>\
Expand Down
60 changes: 0 additions & 60 deletions modules/kogito-maven/3.8.x-rpm/maven/settings.xml

This file was deleted.

Loading

0 comments on commit f1026a9

Please sign in to comment.