Skip to content

Commit 8862b62

Browse files
authored
Changes to run SSL tests on OEL (#54)
1 parent 75b281d commit 8862b62

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

tests/scripts/keys.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ fi
2626

2727
mkdir -p ${CERTS_DIR}
2828

29+
OPENSSL_CNF_FILE=/etc/ssl/openssl.cnf
30+
if [ ! -f ${OPENSSL_CNF_FILE} ] ; then
31+
# Location in OEL, RHEL
32+
OPENSSL_CNF_FILE=/etc/pki/tls/openssl.cnf
33+
fi
34+
2935
# Generate random passwords for each run
3036
PASS="${RANDOM}_${RANDOM}"
3137
KEYPASS="${PASS}"
@@ -40,7 +46,7 @@ echo "${CAPASS}" | openssl genrsa -passout stdin -aes256 \
4046
echo Generate Guardians CA certificate:
4147
echo "${CAPASS}" | openssl req -passin stdin -new -x509 -days 3650 \
4248
-reqexts SAN \
43-
-config <(cat /etc/ssl/openssl.cnf \
49+
-config <(cat ${OPENSSL_CNF_FILE} \
4450
<(printf "\n[SAN]\nsubjectAltName=DNS:localhost,DNS:127.0.0.1")) \
4551
-key ${CERTS_DIR}/guardians-ca.key \
4652
-out ${CERTS_DIR}/guardians-ca.crt \
@@ -53,7 +59,7 @@ echo "${CAPASS}" | openssl genrsa -passout stdin -aes256 \
5359
echo Generate Ravagers CA certificate:
5460
echo "${CAPASS}" | openssl req -passin stdin -new -x509 -days 3650 \
5561
-reqexts SAN \
56-
-config <(cat /etc/ssl/openssl.cnf \
62+
-config <(cat ${OPENSSL_CNF_FILE} \
5763
<(printf "\n[SAN]\nsubjectAltName=DNS:localhost,DNS:127.0.0.1")) \
5864
-key ${CERTS_DIR}/ravagers-ca.key \
5965
-out ${CERTS_DIR}/ravagers-ca.crt \

tests/scripts/run-tests.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ set -e
1414

1515
echo "Coherence CE 22.06.2"
1616
COHERENCE_CLIENT_REQUEST_TIMEOUT=180.0 \
17-
COHERENCE_VERSION=22.06.4 \
1817
make clean test-cluster-shutdown remove-app-images build-test-images test-cluster-startup just-wait test
1918

2019
echo "Coherence CE 22.06.2 with SSL"
@@ -23,5 +22,5 @@ RUN_SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true \
2322
COHERENCE_TLS_CLIENT_CERT=$(pwd)/tests/utils/certs/star-lord.crt \
2423
COHERENCE_TLS_CLIENT_KEY=$(pwd)/tests/utils/certs/star-lord.pem \
2524
COHERENCE_CLIENT_REQUEST_TIMEOUT=180.0 \
26-
COHERENCE_VERSION=22.06.4 PROFILES=,secure make clean certs test-cluster-shutdown remove-app-images \
25+
PROFILES=,secure make clean certs test-cluster-shutdown remove-app-images \
2726
build-test-images test-cluster-startup just-wait test

0 commit comments

Comments
 (0)