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

kernel: Make sure local versions.yaml file from runtime get precedence#432

Merged
devimc merged 1 commit intokata-containers:masterfrom
ganeshmaharaj:build-local-kernel-change
Apr 11, 2019
Merged

kernel: Make sure local versions.yaml file from runtime get precedence#432
devimc merged 1 commit intokata-containers:masterfrom
ganeshmaharaj:build-local-kernel-change

Conversation

@ganeshmaharaj
Copy link
Copy Markdown
Contributor

Fixes: #431

Signed-off-by: Ganesh Maharaj Mahalingam ganesh.mahalingam@intel.com

@ganeshmaharaj
Copy link
Copy Markdown
Contributor Author

@jcvenegas @chavafg your thoughts? this is currently blocking me from testing kata-containers/runtime#1504

@ganeshmaharaj ganeshmaharaj force-pushed the build-local-kernel-change branch from c0f3bb1 to 113361a Compare April 9, 2019 18:15
Fixes: kata-containers#431

Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
@ganeshmaharaj ganeshmaharaj force-pushed the build-local-kernel-change branch from 113361a to 3771b04 Compare April 9, 2019 18:44
@ganeshmaharaj
Copy link
Copy Markdown
Contributor Author

@jcvenegas per our conversation, i have updated the script with a comment and i will open a patch in tests to override the kernel version there.

Copy link
Copy Markdown
Member

@jcvenegas jcvenegas left a comment

Choose a reason for hiding this comment

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

thanks for add the clarification, will help for future references.

@ganeshmaharaj
Copy link
Copy Markdown
Contributor Author

@jcvenegas do we need to trigger CI for this patch given that it is just adding comments?

@jcvenegas
Copy link
Copy Markdown
Member

@ganeshmaharaj I dont think so,
@devimc @grahamwhaley PTAL
just in case the merge button get blocked
/test

@grahamwhaley
Copy link
Copy Markdown
Contributor

/test
just discussing this with @chavafg - yeah, we have to run the CI for everything to get the 'required' CIs OK'd before we can even force merge now... so...

@devimc
Copy link
Copy Markdown

devimc commented Apr 10, 2019

the fix is a comment? 😕

@ganeshmaharaj
Copy link
Copy Markdown
Contributor Author

@devimc if you had glanced at the history of the change, you would have found c0f3bb1 which was the original patch. @jcvenegas later mentioned that such a change was previously there in this particular function and was removed so that during the time of release builds the kernel build will always check the master branch and pull changes from there, and moving this change to tests repository would be a good idea. To avoid another person in the future to come down the same pipe and run the same course, i have added a comment and submitted another patch to tests with kata-containers/tests#1442

Copy link
Copy Markdown

@devimc devimc left a comment

Choose a reason for hiding this comment

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

@devimc devimc merged commit 1d60364 into kata-containers:master Apr 11, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants