fix tests, clean makefile

opendevstack · Mar 27, 2024 · 1ec2796 · 1ec2796
1 parent 4e789cb
commit 1ec2796
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 29 deletions.
diff --git a/Makefile b/Makefile
@@ -153,7 +153,6 @@ install-nexus: apply-nexus-chart start-nexus-build
 
 ## Apply OpenShift resources related to the Nexus.
 apply-nexus-chart:
-#	cd nexus/chart && envsubst < values.yaml.template > values.yaml && helm upgrade --install --namespace $(ODS_NAMESPACE) nexus . && rm values.yaml
 	cd nexus/chart && envsubst < values.yaml.template > values.yaml && helm upgrade --install --namespace $(ODS_NAMESPACE) nexus .
 .PHONY: apply-nexus-chart
 

diff --git a/nexus/chart/values.yaml b/nexus/chart/values.yaml
diff --git a/nexus/test.sh b/nexus/test.sh
@@ -6,7 +6,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 ODS_CORE_DIR=${SCRIPT_DIR%/*}
 ODS_CONFIGURATION_DIR="${ODS_CORE_DIR}/../ods-configuration"
 
-NEXUS_IMAGE=$("${ODS_CORE_DIR}"/scripts/get-sample-param.sh NEXUS_FROM_IMAGE)
+NEXUS_IMAGE=$("${ODS_CORE_DIR}"/scripts/get-sample-param.sh NEXUS_IMAGE_TAG)
 
 function usage {
     printf "Test Nexus setup.\n\n"
@@ -62,7 +62,7 @@ if ! $VERIFY_ONLY; then
     NO_PROXY=
 
     echo "Run container using image ${NEXUS_IMAGE}"
-    containerId=$(docker run -d -p "${HOST_PORT}:8081" -e HTTP_PROXY="${HTTP_PROXY}" -e HTTPS_PROXY="${HTTPS_PROXY}" -e NO_PROXY="${NO_PROXY}" "${NEXUS_IMAGE}")
+    containerId=$(docker run -d -p "${HOST_PORT}:8081" -e HTTP_PROXY="${HTTP_PROXY}" -e HTTPS_PROXY="${HTTPS_PROXY}" -e NO_PROXY="${NO_PROXY}" "sonatype/nexus3:${NEXUS_IMAGE}")
 
     function cleanup {
         echo "Cleanup"