Skip to content

Commit

Permalink
Merge pull request #914 from nolar/upgrade-k8s
Browse files Browse the repository at this point in the history
Upgrade k3s & k8s to 1.23 as the latest one
  • Loading branch information
nolar committed Apr 2, 2022
2 parents b1ae024 + 3990f37 commit 454bebc
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
strategy:
fail-fast: false
matrix:
k3s: [v1.22, v1.21, v1.20, v1.19]
k3s: [latest, v1.22, v1.21, v1.20, v1.19]
name: K3s ${{matrix.k3s}}
runs-on: ubuntu-20.04
timeout-minutes: 10 # usually 4-5 mins
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/thorough.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
strategy:
fail-fast: false
matrix:
k3s: [latest, v1.21, v1.20, v1.19]
k3s: [latest, v1.22, v1.21, v1.20, v1.19]
name: K3s ${{matrix.k3s}}
runs-on: ubuntu-20.04
timeout-minutes: 10 # usually 4-5 mins
Expand All @@ -124,7 +124,7 @@ jobs:
strategy:
fail-fast: false
matrix:
k8s: [latest, v1.21.2, v1.20.8, v1.19.12]
k8s: [latest, v1.22.8, v1.21.11, v1.20.15, v1.19.16]
name: K8s ${{matrix.k8s}}
runs-on: ubuntu-20.04
timeout-minutes: 10 # usually 4-5 mins
Expand Down
4 changes: 2 additions & 2 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ def assert_logs_fn(patterns, prohibited=[], strict=False):
break # out of `remaining_patterns` cycle
else:
skipped_patterns = remaining_patterns[:idx]
raise AssertionError(f"Few patterns were skipped: {skipped_patterns!r}")
raise AssertionError(f"Several patterns were skipped: {skipped_patterns!r}")
elif strict:
raise AssertionError(f"Unexpected log message: {message!r}")

Expand All @@ -686,7 +686,7 @@ def assert_logs_fn(patterns, prohibited=[], strict=False):
# If all patterns have been matched in order, we are done.
# if some are left, but the messages are over, then we fail.
if remaining_patterns:
raise AssertionError(f"Few patterns were missed: {remaining_patterns!r}")
raise AssertionError(f"Several patterns were missed: {remaining_patterns!r}")

return assert_logs_fn

Expand Down

0 comments on commit 454bebc

Please sign in to comment.