Skip to content

Commit

Permalink
change mend script
Browse files Browse the repository at this point in the history
change sha256

swith to md5

remove md5

add debug

fix module.yaml

Update maven download location
  • Loading branch information
kevin-ortega committed Jan 24, 2024
1 parent 9a98a09 commit 283f89e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .one-pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ containerize:
done < <(list_artifacts)
echo "MEND unified agent scan"
chmod +x "${COMMONS_PATH}/whitesource/whitesource_unified_agent_scan.sh"
source "${COMMONS_PATH}/whitesource/whitesource_unified_agent_scan.sh"
chmod +x "${COMMONS_PATH}"/mend/mend_unified_agent_scan.sh
source "${COMMONS_PATH}"/mend/mend_unified_agent_scan.sh
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ PROD_NAMESPACE?=ibmcom
PLATFORM=websphere-liberty-s2i
IMAGE_NAME=${NAMESPACE}/${PLATFORM}
BUILD_IMAGE_NAME=${PROD_NAMESPACE}/${PLATFORM}
DOCKER_HOST=tcp://localhost:2376
#DOCKER_HOST=tcp://localhost:2376

build = ./build.sh

Expand Down
8 changes: 3 additions & 5 deletions modules/maven/module.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@ schema_version: 1

name: maven
version: 1.0
description: "Module used to install Maven 3.9.3"
description: "Module used to install Maven 3.8.8"

# Defined artifacts that are used to build the image
artifacts:
- name: maven.tar.gz
url: https://www.apache.org/dist/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz
sha512: 332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00

url: https://downloads.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz
sha512: 332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00
execute:
- script: install.sh

10 changes: 5 additions & 5 deletions test/run
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ DEPLOY_TO_APPS_VAR="-e DEPLOY_TO_APPS=true"

# Since we built the image locally, we don't want S2I attempt to pull
# it from Docker hub
s2i_args="--pull-policy=never"
s2i_args="--pull-policy=never --loglevel 5"

test_port=9080
test_root=sample
Expand Down Expand Up @@ -60,7 +60,7 @@ prepare() {

echo "DOCKER_API_VERSION ${DOCKER_API_VERSION}"
echo "s2i build ${s2i_args} ${test_dir}/$app ${BUILD_IMAGE_NAME}:${IMAGE_VERSION} ${BUILD_IMAGE_NAME}-testapp $@"
s2i build ${s2i_args} ${test_dir}/$app ${BUILD_IMAGE_NAME}:${IMAGE_VERSION} ${BUILD_IMAGE_NAME}-testapp $@ >& $s2i_log_file
s2i build ${s2i_args} ${test_dir}/$app ${BUILD_IMAGE_NAME}:${IMAGE_VERSION} ${BUILD_IMAGE_NAME}-testapp $@
echo "s2i build ${s2i_args} ${test_dir}/$app ${BUILD_IMAGE_NAME}:${IMAGE_VERSION} ${BUILD_IMAGE_NAME}-runtime-testapp --runtime-image ${BUILD_IMAGE_NAME}:${RUNTIME_IMAGE_VERSION} --runtime-artifact /opt/ibm/wlp/usr $@"
s2i build ${s2i_args} ${test_dir}/$app ${BUILD_IMAGE_NAME}:${IMAGE_VERSION} ${BUILD_IMAGE_NAME}-runtime-testapp --runtime-image ${BUILD_IMAGE_NAME}:${RUNTIME_IMAGE_VERSION} --runtime-artifact /opt/ibm/wlp/usr $@ >& $s2i_log_file

Expand All @@ -78,7 +78,7 @@ run_test_application() {

cleanupContainer() {
echo "Cleanup for test, cid $(cat $cid_file)"
if container_exists; then
if container_exists; then
if [[ $1 != "0" ]]; then
echo "Viewing docker logs"
docker logs $(cat $cid_file)
Expand All @@ -89,15 +89,15 @@ cleanupContainer() {
rm -f $cid_file
}

cleanupImages() {
cleanupImages() {
if image_exists ${BUILD_IMAGE_NAME}-testapp; then
docker rmi -f ${BUILD_IMAGE_NAME}-testapp
fi
if image_exists ${BUILD_IMAGE_NAME}-runtime-testapp; then
docker rmi -f ${BUILD_IMAGE_NAME}-runtime-testapp
fi
rm -rf ${test_dir}/test-app/.git

}

cleanupFinal() {
Expand Down

0 comments on commit 283f89e

Please sign in to comment.