Skip to content

v1.7 backports 2021-04-16 #15751

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

Jump to bottom
Merged
merged 1 commit into from
Apr 17, 2021
Merged

v1.7 backports 2021-04-16 #15751

merged 1 commit into from
Apr 17, 2021

Conversation

joestringer
Copy link
Member

@joestringer joestringer commented Apr 16, 2021 •
edited
Loading

Once this PR is merged, you can update the PR labels via:

$ for pr in 15748; do contrib/backporting/set-labels.py $pr done 1.7; done

@joestringer joestringer requested a review from a team as a code owner April 16, 2021 20:44
@joestringer joestringer added backport/1.7 kind/backports This PR provides functionality previously merged into master. labels Apr 16, 2021
@joestringer
Copy link
Member Author

test-backport-1.7

@aanm
Copy link
Member

aanm commented Apr 16, 2021

@joestringer legit failure 😢

00:25:28  + cd /home/jenkins/workspace/Cilium-PR-Ginkgo-Tests-Validated/k8s-1.17-gopath/src/github.com/cilium/cilium/test
00:25:28  + sed -r s/([^ ]* |^[^ ]*$)//
00:25:28  + + sed s/^$/K8s*/
00:25:28  + sed s/Runtime.*/NoTests/
00:25:28  echo test-backport-1.7
00:25:28  + ./print-node-ip.sh
00:25:28  + HOME=/home/jenkins/workspace/Cilium-PR-Ginkgo-Tests-Validated/k8s-1.17-gopath ginkgo --focus=K8s* -v --failFast=false -- -cilium.provision=false -cilium.timeout=300m -cilium.kubeconfig=/home/jenkins/workspace/Cilium-PR-Ginkgo-Tests-Validated/k8s-1.17-gopath/src/github.com/cilium/cilium/test/vagrant-kubeconfig -cilium.passCLIEnvironment=true -cilium.registry=147.75.75.45
00:26:55  Failed to compile test:
00:26:55  
00:26:55  # github.com/cilium/cilium/test/helpers
00:26:55  helpers/kubectl.go:274:4: undefined: ginkgoext.Failf
00:26:55  helpers/kubectl.go:3154:46: res.GetStdOut().String undefined (type string has no field or method String)
00:26:55  
00:26:55  Ginkgo ran 1 suite in 1m23.74134078s
00:26:55  Test Suite Failed

@nebril @joestringer
test: ensure kubectl version is available for test run
38f8507 
[ upstream commit 6181255 ]

[ Backporter's notes: All hunks needed conflict resolution. Mostly just
    including the new code into the older version of the branch. Also needed
    to resolve these errors:
    $ make -C test/ build
    config/config.go:82:2: undefined: flagset
    helpers/kubectl.go:274:4: undefined: ginkgoext.Failf
    helpers/kubectl.go:3154:46: res.GetStdOut().String undefined
        (type string has no field or method String)
]

This change makes K8s ginkgo test suite download kubectl version
compatible with current cluster version if it's not available.

Signed-off-by: Maciej Kwiek <maciej@isovalent.com>
Signed-off-by: Joe Stringer <joe@cilium.io>
@joestringer
Copy link
Member Author

I forgot to commit my local changes :)

@joestringer joestringer force-pushed the pr/v1.7-backport-2021-04-16 branch from 4d18eba to 38f8507 Compare April 16, 2021 23:06
@joestringer
Copy link
Member Author

test-backport-1.7

@joestringer joestringer merged commit 07d6457 into cilium:v1.7 Apr 17, 2021
@joestringer joestringer deleted the pr/v1.7-backport-2021-04-16 branch April 17, 2021 02:26
@joestringer joestringer mentioned this pull request Apr 20, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aanm aanm aanm approved these changes

Assignees
No one assigned
Labels
kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@joestringer @aanm @nebril