diff --git a/.one-pipeline.yaml b/.one-pipeline.yaml index 48e64c7..b634174 100644 --- a/.one-pipeline.yaml +++ b/.one-pipeline.yaml @@ -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 diff --git a/Makefile b/Makefile index 0a7b0fb..4f3a10c 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/modules/maven/module.yaml b/modules/maven/module.yaml index 276ab8e..a02aa8d 100644 --- a/modules/maven/module.yaml +++ b/modules/maven/module.yaml @@ -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 - diff --git a/test/run b/test/run index 3646e2c..bd50d94 100755 --- a/test/run +++ b/test/run @@ -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) @@ -89,7 +89,7 @@ cleanupContainer() { rm -f $cid_file } -cleanupImages() { +cleanupImages() { if image_exists ${BUILD_IMAGE_NAME}-testapp; then docker rmi -f ${BUILD_IMAGE_NAME}-testapp fi @@ -97,7 +97,7 @@ cleanupImages() { docker rmi -f ${BUILD_IMAGE_NAME}-runtime-testapp fi rm -rf ${test_dir}/test-app/.git - + } cleanupFinal() {