Skip to content

Commit 646523f

Browse files
authored
[1.27-strict] Backport Add optional skip to community addons, bump upgrade path (#4529) (#4532)
1 parent b201b73 commit 646523f

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

tests/libs/addons.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,10 @@ then
112112
setup_addons_tests "$NAME" "$DISTRO" "$PROXY" "$TO_CHANNEL"
113113
run_smoke_test "$NAME"
114114
run_core_addons_tests "$NAME"
115-
run_community_addons_tests "$NAME"
115+
DISABLE_COMMUNITY_TESTS="${DISABLE_COMMUNITY_TESTS:-0}"
116+
if [ "x${DISABLE_COMMUNITY_TESTS}" != "x1" ]; then
117+
run_community_addons_tests "$NAME"
118+
fi
116119
run_eksd_addons_tests
117120
run_gpu_addon_test
118121
post_addons_tests "$NAME"

tests/test-cluster-agent.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class TestClusterAgent(object):
88

99
def test_cluster_agent_health(self):
1010
"""
11-
Query the cluster agent health endpoint to verify it is up and healty.
11+
Query the cluster agent health endpoint to verify it is up and healthy.
1212
1313
"""
1414
response = requests.get(

tests/test-upgrade-path.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def test_refresh_path(self):
2727
Deploy an old snap and try to refresh until the current one.
2828
2929
"""
30-
start_channel = 19
30+
start_channel = 24
3131
if is_strict():
3232
start_channel = 25
3333
last_stable_minor = None

upgrade-scripts/000-switch-to-calico/resources/calico.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ spec:
333333
numAllowedLocalASNumbers:
334334
description: Maximum number of local AS numbers that are allowed in
335335
the AS path for received routes. This removes BGP loop prevention
336-
and should only be used if absolutely necesssary.
336+
and should only be used if absolutely necessary.
337337
format: int32
338338
type: integer
339339
password:

0 commit comments

Comments
 (0)