Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

test: cluster.sh fixes for rotate-certs #4382

Merged
merged 1 commit into from
Apr 27, 2021
Merged

test: cluster.sh fixes for rotate-certs #4382

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions test/e2e/cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ function rotateCertificates {
--client-id ${AZURE_CLIENT_ID} \
--client-secret ${AZURE_CLIENT_SECRET} \
--subscription-id ${AZURE_SUBSCRIPTION_ID} \
--azure-env ${AZURE_ENV} \
--identity-system ${IDENTITY_SYSTEM} \
--debug

# Retry if it fails the first time (validate --certificate-profile instead of regenerating a new set of certs)
Expand Down Expand Up @@ -109,6 +111,8 @@ function rotateCertificates {
--client-secret ${AZURE_CLIENT_SECRET} \
--subscription-id ${AZURE_SUBSCRIPTION_ID} \
--certificate-profile _output/${RESOURCE_GROUP}/certificateProfile.json --force \
--azure-env ${AZURE_ENV} \
--identity-system ${IDENTITY_SYSTEM} \
--debug

exit $?
Expand All @@ -119,7 +123,7 @@ echo "Running E2E tests against a cluster built with the following API model:"
cat ${TMP_DIR}/apimodel-input.json

CLEANUP_AFTER_DEPLOYMENT=${CLEANUP_ON_EXIT}
if [ "${UPGRADE_CLUSTER}" = "true" ] || [ "${SCALE_CLUSTER}" = "true" ] || [ -n "$ADD_NODE_POOL_INPUT" ]; then
if [ "${UPGRADE_CLUSTER}" = "true" ] || [ "${SCALE_CLUSTER}" = "true" ] || [ -n "$ADD_NODE_POOL_INPUT" ] || [ "${ROTATE_CERTS}" = "true" ]; then
CLEANUP_AFTER_DEPLOYMENT="false"
fi

Expand Down Expand Up @@ -311,6 +315,10 @@ if [ "${ROTATE_CERTS}" = "true" ]; then
SKIP_AFTER_ROTATE_CERTS="should be able to autoscale"
SKIP_AFTER_SCALE_DOWN="${SKIP_AFTER_SCALE_DOWN}|should be able to autoscale"
SKIP_AFTER_SCALE_UP="${SKIP_AFTER_SCALE_DOWN}|should be able to autoscale"
CLEANUP_AFTER_ROTATE_CERTS=${CLEANUP_ON_EXIT}
if [ "${UPGRADE_CLUSTER}" = "true" ] || [ "${SCALE_CLUSTER}" = "true" ] || [ -n "$ADD_NODE_POOL_INPUT" ]; then
CLEANUP_AFTER_ROTATE_CERTS="false"
fi

docker run --rm \
-v $(pwd):${WORK_DIR} \
Expand All @@ -328,7 +336,7 @@ if [ "${ROTATE_CERTS}" = "true" ]; then
-e LB_TIMEOUT=${LB_TEST_TIMEOUT} \
-e KUBERNETES_IMAGE_BASE=$KUBERNETES_IMAGE_BASE \
-e KUBERNETES_IMAGE_BASE_TYPE=$KUBERNETES_IMAGE_BASE_TYPE \
-e CLEANUP_ON_EXIT=false \
-e CLEANUP_ON_EXIT=${CLEANUP_AFTER_ROTATE_CERTS} \
-e REGIONS=$REGION \
-e IS_JENKINS=${IS_JENKINS} \
-e SKIP_LOGS_COLLECTION=true \
Expand Down