Skip to content

Commit

Permalink
.github/workflows: remove timeout workaround
Browse files Browse the repository at this point in the history
This was introduced in commit 2641808 ("ci-multicluster: Fix
post-test information gathering") to work around cilium/cilium-cli#384.
That issue is fixed in the v0.8.4 cilium-cli release, so drop the
workaround.

Suggested-by: Sebastian Wicki <sebastian@isovalent.com>
Signed-off-by: Tobias Klauser <tobias@cilium.io>
  • Loading branch information
tklauser authored and joestringer committed Jul 9, 2021
1 parent 4e3e5b8 commit cb9ecdc
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/conformance-multicluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -291,11 +291,9 @@ jobs:
if: ${{ failure() }}
run: |
cilium status --context ${{ steps.contexts.outputs.context1 }}
# FIXME: Use of timeout is a workaround for cilium/cilium-cli#384
timeout 5s cilium clustermesh status --context ${{ steps.contexts.outputs.context1 }}
cilium clustermesh status --context ${{ steps.contexts.outputs.context1 }}
cilium status --context ${{ steps.contexts.outputs.context2 }}
# FIXME: Use of timeout is a workaround for cilium/cilium-cli#384
timeout 5s cilium clustermesh status --context ${{ steps.contexts.outputs.context2 }}
cilium clustermesh status --context ${{ steps.contexts.outputs.context2 }}
curl -sLO https://github.com/cilium/cilium-sysdump/releases/latest/download/cilium-sysdump.zip
kubectl config use-context ${{ steps.contexts.outputs.context1 }}
Expand Down

0 comments on commit cb9ecdc

Please sign in to comment.