Skip to content
This repository has been archived by the owner on May 6, 2020. It is now read-only.

Revert "Merge pull request #587 from mcastelino/topic/govet" #616

Merged
merged 1 commit into from
Sep 25, 2017
Merged

Revert "Merge pull request #587 from mcastelino/topic/govet" #616

merged 1 commit into from
Sep 25, 2017

Conversation

jodh-intel
Copy link
Contributor

This reverts commit 535be19, reversing
changes made to 7e2466d.

This change broke the Jenkins CI and local unit-test builds (unable to
run them with either go 1.8 or go 1.9).

Fixes #615.

Signed-off-by: James O. D. Hunt james.o.hunt@intel.com

@jodh-intel
Copy link
Contributor Author

Hi @grahamwhaley - please can you review?

@mcastelino - fyi I've reverted the entire PR as don't want to pick through it all. Please can you re-raise once you've resolved the issue I'm reverting for?

@grahamwhaley
Copy link
Contributor

grahamwhaley commented Sep 25, 2017 •
edited
Loading

Very odd - if it is in the test item, there has been very little activity in there:
https://github.com/stretchr/testify/commits/master
Presuming the CI is now happy (and, yes, it would seem very odd that it was happy before - but, maybe it was one of those 'broken days' and we forced it - iirc - so we could fix another part of the CI....)
lgtm

Approved with PullApprove Approved with PullApprove

@jodh-intel
Revert: Undo "Merge pull request clearcontainers#587 from mcastelino/…
d4954bc 
…topic/govet"

This reverts commit 535be19, reversing
changes made to 7e2466d.

This change broke the Jenkins CI and local unit-test builds (unable to
run them with either go 1.8 or go 1.9).

Fixes clearcontainers#615.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
@jodh-intel
Copy link
Contributor Author

Hi @sameo, @grahamwhaley - this PR is failing under jenkins 17.04 after passing all the unit tests as the timeout is seemingly too lower for Jenkins:

--- PASS: TestVersion (0.00s)
11:48:40 PASS
11:48:40 coverage: 97.3% of statements
11:48:40 panic: test timed out after 5s

I've raised #618 to increase the timeout but we may need to force merge one of these two to return the CI to normal operation...

@jodh-intel
Copy link
Contributor Author

@sameo, @grahamwhaley - I think we're going to have to force-merge this one. I can then rebase #618 to avoid future test timeouts.

@sameo
Copy link

sameo commented Sep 25, 2017 •
edited by grahamwhaley
Loading

LGTM

Approved with PullApprove Approved with PullApprove

@sameo sameo merged commit 8bf3aab into clearcontainers:master Sep 25, 2017
@sameo sameo removed the in progress label Sep 25, 2017
@clearcontainersbot
Copy link

kubernetes qa-passed 👍

@mcastelino
Copy link
Contributor

mcastelino commented Oct 9, 2017 •
edited
Loading

@jodh-intel I know you backed this off. But we have an issue. With later go version we need this fix. And this fix is not backward compatible. This is a known issue with testify

stretchr/testify#339

/cc @sboeuf

mcastelino pushed a commit to mcastelino/runtime that referenced this pull request Dec 6, 2018
Merge pull request clearcontainers#616 from Weichen81/master
500d017 
qemu/arm64: Detect host GIC version to configure guest GIC
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@grahamwhaley grahamwhaley grahamwhaley approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jodh-intel @grahamwhaley @sameo @clearcontainersbot @mcastelino