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

unit test: Fix local test #1313

Merged
merged 2 commits into from
Mar 6, 2019
Merged

unit test: Fix local test #1313

merged 2 commits into from
Mar 6, 2019

Conversation

jcvenegas
Copy link
Member

@jcvenegas jcvenegas commented Mar 1, 2019 •
edited
Loading

@grahamwhaley
Copy link
Contributor

/test
as I suspect you would not have pushed it if you didn't want to see what the CIs thought...

@jcvenegas
unit-test: Fix local test
fcee080 
Simplify empty string proxy type handling and cast invalid proxy type to
ProxyType.

Fixes: kata-containers#1312

Signed-off-by: Jose Carlos Venegas Munoz <[email protected]>
@jcvenegas
Copy link
Member Author

/test

@jcvenegas
virtcontainers: makefile fix .ci path
c964a26 
If enter to vircontainers directory and do make check-go-test, the makefile
does not found the kata .ci directory use relative path to makefile.

Signed-off-by: Jose Carlos Venegas Munoz <[email protected]>
@jcvenegas
Copy link
Member Author

/test

@jcvenegas
Copy link
Member Author

@kata-containers/runtime ready to review

jodh-intel
jodh-intel approved these changes Mar 6, 2019
View reviewed changes
Copy link
Contributor

@jodh-intel jodh-intel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't not read MK_DIR as mkdir rather than "directory of makefile", but that's prolly just me ;)

/me goes for coffee in the hope of banishing any more double-negatives...

grahamwhaley
grahamwhaley approved these changes Mar 6, 2019
View reviewed changes
Copy link
Contributor

@grahamwhaley grahamwhaley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@grahamwhaley
Copy link
Contributor

The opensuse CI fail looks unrelated. @GabyCT - is this one you know of/have fixed already:

Problem: conflicting requests
 Solution 1: Following actions will be done:
  do not ask to delete all solvables providing docker.x86_64 = 18.06.1_ce-lp150.5.6.1
  keep docker-libnetwork-0.7.0.1+gitr2664_3ac297bc7fd0-lp150.3.3.1.x86_64
  keep docker-runc-1.0.0rc5+gitr3562_69663f0bd4b6-lp150.5.7.1.x86_64
 Solution 2: remove lock to allow removal of docker-18.06.1_ce-lp150.5.6.1.x86_64

@grahamwhaley
Copy link
Contributor

Other CIs are happy ... merging

@grahamwhaley grahamwhaley merged commit ec6a1cc into kata-containers:master Mar 6, 2019
@jcvenegas jcvenegas deleted the fix-unit-test branch January 23, 2020 19:44
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jodh-intel jodh-intel jodh-intel approved these changes

@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.
3 participants
@jcvenegas @grahamwhaley @jodh-intel