Skip to content

Commit 747924c

Browse files
committed
enabled usage of usual contianer url
1 parent 936296e commit 747924c

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

containersQa/testlib.bash

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,12 @@ function processArguments() {
4848
else
4949
echo "OpenJDK Container Image not found on Brew. Check that images exists."
5050
echo "Failed Image: $ARG_JDK"
51-
exit 1
51+
if [ "$REMOTE_NORMAL_CONTAINER" = "true" ] ; then
52+
echo "using directly $ARG_JDK"
53+
FORCED_ARG_HASH="${ARG_JDK}"
54+
else
55+
exit 1
56+
fi
5257
fi
5358

5459
if [[ -z $ARG_REPORT_DIR ]] ; then
@@ -172,7 +177,11 @@ function cleanContainerQaPropertiesFile() {
172177
}
173178

174179
function getHashFromImageId() {
175-
HASH=`$PD_PROVIDER inspect $JDK_CONTAINER_IMAGE --format "{{.Id}}"`
180+
if [ -z "${FORCED_ARG_HASH}" ] ; then
181+
HASH=`$PD_PROVIDER inspect $JDK_CONTAINER_IMAGE --format "{{.Id}}"`
182+
else
183+
HASH="${FORCED_ARG_HASH}"
184+
fi
176185
echo "The Image under test's ID is: $HASH"
177186
}
178187

run_containerqa.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ mkdir -p $jtReport
7676
export SCRATCH_DISK="`pwd`/$jtWork"
7777
export WORKSPACE="`pwd`/$jtReport"
7878
SUITE_FOLDER="containersQa"
79-
bash ${SCRIPT_DIR}/run-folder-as-tests/run-folder-as-tests.sh ${SCRIPT_DIR}/${SUITE_FOLDER} ${CONTAINER_VERSION}
79+
REMOTE_NORMAL_CONTAINER=true bash ${SCRIPT_DIR}/run-folder-as-tests/run-folder-as-tests.sh ${SCRIPT_DIR}/${SUITE_FOLDER} ${CONTAINER_VERSION} | tee test.${TIME}/tests.log
8080

8181
toPack="${jtReport} test.${TIME}/tests.log"
8282
if [ "x$JNI_PACK_WORK" == "xtrue" ] ; then

0 commit comments

Comments
 (0)