Skip to content

Commit

Permalink
Improving e2e reliability
Browse files Browse the repository at this point in the history
Fixed access to nil pointer, which was polluting error messages.
Increased memory for fedora vagrant as kubectl rollout is getting stuck at times, and may be related to:
https://kubernetes.io/docs/tasks/manage-daemon/update-daemon-set/\#some-nodes-run-out-of-resources
  • Loading branch information
pjbgf authored and k8s-ci-robot committed Nov 25, 2021
1 parent 7ee649d commit 568d383
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ jobs:
- name: Boot Virtual Machine
run: make vagrant-up-fedora
- name: Show environment information
run: $RUN kubectl get nodes -o wide
run: |
$RUN kubectl wait --for=condition=ready --timeout=60s node 127.0.0.1
$RUN kubectl get nodes -o wide
- name: Run E2E tests
run: $RUN hack/ci/e2e-fedora.sh

Expand All @@ -93,6 +95,8 @@ jobs:
- name: Boot Virtual Machine
run: make vagrant-up-ubuntu
- name: Show environment information
run: $RUN kubectl get nodes -o wide
run: |
$RUN kubectl wait --for=condition=ready --timeout=60s node ubuntu-focal
$RUN kubectl get nodes -o wide
- name: Run E2E tests
run: $RUN hack/ci/e2e-ubuntu.sh
2 changes: 1 addition & 1 deletion hack/ci/Vagrantfile-fedora
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Vagrant box for testing
Vagrant.configure("2") do |config|
config.vm.box = "fedora/35-cloud-base"
memory = 6144
memory = 8192
cpus = 4

config.vm.provider :virtualbox do |v|
Expand Down
5 changes: 4 additions & 1 deletion test/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,10 @@ func (e *e2e) setWorkDir() string {
func (e *e2e) run(cmd string, args ...string) string {
output, err := command.New(cmd, args...).RunSuccessOutput()
e.Nil(err)
return output.OutputTrimNL()
if output != nil {
return output.OutputTrimNL()
}
return ""
}

func (e *e2e) runFailure(cmd string, args ...string) string {
Expand Down

0 comments on commit 568d383

Please sign in to comment.