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

test: don't perform stability tests on long-running cluster configs #3464

Merged
merged 3 commits into from
Jun 12, 2020
Merged

test: don't perform stability tests on long-running cluster configs #3464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c3c55b
test: don't perform stability tests on long-running cluster configs
jackfrancis Jun 12, 2020
bf1667d
hmm, str
jackfrancis Jun 12, 2020
ccba554
test: update cluster.sh
jackfrancis Jun 12, 2020
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
5 changes: 5 additions & 0 deletions test/e2e/cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ docker run --rm \
-e GRAPH_ENDPOINT="${GRAPH_ENDPOINT}" \
-e SERVICE_MANAGEMENT_VM_DNS_SUFFIX="${SERVICE_MANAGEMENT_VM_DNS_SUFFIX}" \
-e RESOURCE_MANAGER_VM_DNS_SUFFIX="${RESOURCE_MANAGER_VM_DNS_SUFFIX}" \
-e STABILITY_ITERATIONS=${STABILITY_ITERATIONS} \
"${DEV_IMAGE}" make test-kubernetes || exit 1

if [ "${UPGRADE_CLUSTER}" = "true" ] || [ "${SCALE_CLUSTER}" = "true" ] || [ -n "$ADD_NODE_POOL_INPUT" ] || [ "${GET_CLUSTER_LOGS}" = "true" ]; then
Expand Down Expand Up @@ -254,6 +255,7 @@ if [ -n "$ADD_NODE_POOL_INPUT" ]; then
-e GRAPH_ENDPOINT="${GRAPH_ENDPOINT}" \
-e SERVICE_MANAGEMENT_VM_DNS_SUFFIX="${SERVICE_MANAGEMENT_VM_DNS_SUFFIX}" \
-e RESOURCE_MANAGER_VM_DNS_SUFFIX="${RESOURCE_MANAGER_VM_DNS_SUFFIX}" \
-e STABILITY_ITERATIONS=${STABILITY_ITERATIONS} \
${DEV_IMAGE} make test-kubernetes || exit 1
fi

Expand Down Expand Up @@ -322,6 +324,7 @@ if [ "${SCALE_CLUSTER}" = "true" ]; then
-e GRAPH_ENDPOINT="${GRAPH_ENDPOINT}" \
-e SERVICE_MANAGEMENT_VM_DNS_SUFFIX="${SERVICE_MANAGEMENT_VM_DNS_SUFFIX}" \
-e RESOURCE_MANAGER_VM_DNS_SUFFIX="${RESOURCE_MANAGER_VM_DNS_SUFFIX}" \
-e STABILITY_ITERATIONS=${STABILITY_ITERATIONS} \
${DEV_IMAGE} make test-kubernetes || exit 1
fi

Expand Down Expand Up @@ -402,6 +405,7 @@ if [ "${UPGRADE_CLUSTER}" = "true" ]; then
-e GRAPH_ENDPOINT="${GRAPH_ENDPOINT}" \
-e SERVICE_MANAGEMENT_VM_DNS_SUFFIX="${SERVICE_MANAGEMENT_VM_DNS_SUFFIX}" \
-e RESOURCE_MANAGER_VM_DNS_SUFFIX="${RESOURCE_MANAGER_VM_DNS_SUFFIX}" \
-e STABILITY_ITERATIONS=${STABILITY_ITERATIONS} \
${DEV_IMAGE} make test-kubernetes || exit 1
done
fi
Expand Down Expand Up @@ -471,5 +475,6 @@ if [ "${SCALE_CLUSTER}" = "true" ]; then
-e GRAPH_ENDPOINT="${GRAPH_ENDPOINT}" \
-e SERVICE_MANAGEMENT_VM_DNS_SUFFIX="${SERVICE_MANAGEMENT_VM_DNS_SUFFIX}" \
-e RESOURCE_MANAGER_VM_DNS_SUFFIX="${RESOURCE_MANAGER_VM_DNS_SUFFIX}" \
-e STABILITY_ITERATIONS=${STABILITY_ITERATIONS} \
${DEV_IMAGE} make test-kubernetes || exit 1
fi
3 changes: 2 additions & 1 deletion test/e2e/test_cluster_configs/availabilityset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"env": {
"SCALE_CLUSTER": true
"SCALE_CLUSTER": true,
"STABILITY_ITERATIONS": "0"
},
"apiModel": {
"apiVersion": "vlabs",
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/test_cluster_configs/base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"SKIP_TESTS_AFTER_ADD_POOL": "true",
"SKIP_TESTS_AFTER_SCALE_DOWN": "true",
"SKIP_TESTS_AFTER_UPGRADE": "true",
"SKIP_TESTS_AFTER_SCALE_UP": "false"
"SKIP_TESTS_AFTER_SCALE_UP": "false",
"STABILITY_ITERATIONS": "0"
},
"apiModel": {
"apiVersion": "vlabs",
Expand Down