Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GitHub Actions, kind, integration test logs fixes #3372

Merged
merged 1 commit into from
Sep 4, 2019
Merged

GitHub Actions, kind, integration test logs fixes #3372

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion .github/workflows/workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,9 @@ jobs:
run: |
TAG="$(CI_FORCE_CLEAN=1 bin/root-tag)"
export KIND_CLUSTER=github-$TAG-${{ matrix.integration_test }}
bin/kind create cluster --name=$KIND_CLUSTER --wait=1m
# retry cluster creation once in case of port conflict or kubeadm failure
bin/kind create cluster --name=$KIND_CLUSTER --wait=2m --loglevel debug ||
bin/kind create cluster --name=$KIND_CLUSTER --wait=2m --loglevel debug
ihcsim marked this conversation as resolved.
Show resolved Hide resolved
scp $(bin/kind get kubeconfig-path --name=$KIND_CLUSTER) github@$DOCKER_ADDRESS:/tmp

kind_integration:
Expand Down
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ jobs:
- |
# create kind cluster
export KIND_CLUSTER=travis-$TRAVIS_BUILD_ID-$INTEGRATION_TEST
bin/kind create cluster --name=$KIND_CLUSTER
# retry cluster creation once in case of port conflict or kubeadm failure
bin/kind create cluster --name=$KIND_CLUSTER --wait=2m --loglevel debug ||
bin/kind create cluster --name=$KIND_CLUSTER --wait=2m --loglevel debug
- |
# Save kubeconfig to remote docker host for kind integration test stages.
scp $(bin/kind get kubeconfig-path --name=$KIND_CLUSTER) $USER@$REMOTE_DOCKER:/tmp
Expand Down
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
![Linkerd][logo]

[![Build Status][ci-badge]][ci]
[![GitHub Actions Status][github-actions-badge]][github-actions]
[![GitHub license][license-badge]](LICENSE)
[![Go Report Card][go-report-card-badge]][go-report-card]
[![Slack Status][slack-badge]][slack]
Expand Down Expand Up @@ -75,6 +76,8 @@ specific language governing permissions and limitations under the License.
<!-- refs -->
[ci]: https://travis-ci.org/linkerd/linkerd2
[ci-badge]: https://travis-ci.org/linkerd/linkerd2.svg?branch=master
[github-actions]: https://github.com/linkerd/linkerd2/actions
[github-actions-badge]: https://github.com/linkerd/linkerd2/workflows/CI/badge.svg
[cncf]: https://www.cncf.io/
[coc]: https://github.com/linkerd/linkerd/wiki/Linkerd-code-of-conduct
[getting-started]: https://linkerd.io/2/getting-started/
Expand Down
7 changes: 6 additions & 1 deletion test/install_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,12 @@ func TestLogs(t *testing.T) {
// does not return 10,000 after 2 seconds. We don't need 10,000 log lines.
outputLines, _ := outputStream.ReadUntil(10000, 2*time.Second)
if len(outputLines) == 0 {
t.Errorf("No logs found for %s", name)
// Retry one time for 30 more seconds, in case the cluster is slow to
// produce log lines.
outputLines, _ = outputStream.ReadUntil(10000, 30*time.Second)
if len(outputLines) == 0 {
t.Errorf("No logs found for %s", name)
}
}

for _, line := range outputLines {
Expand Down