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

obs: let patch set in order before apply them#1016

Merged
devimc merged 1 commit into
kata-containers:masterfrom
jongwu:order
Apr 17, 2020
Merged

obs: let patch set in order before apply them#1016
devimc merged 1 commit into
kata-containers:masterfrom
jongwu:order

Conversation

@jongwu
Copy link
Copy Markdown
Contributor

@jongwu jongwu commented Apr 16, 2020

obs ci for linuxcontainer will fail when apply patch set which have
dependency within. so patch set should be made in order before feed
to apply.

Fixes: #1015

Signed-off-by: Jianyong Wu jianyong.wu@arm.com

@grahamwhaley @jodh-intel

Copy link
Copy Markdown

@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.

Thanks @jongwu and good catch! 😄!

Comment thread kernel/kata_config_version Outdated
@@ -1 +1 @@
72
73
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Nit: I don't think this is strictly necessary since you are not changing any (other) files below kernel/* here.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

ok, I will change it back.

obs ci for linuxcontainer will fail when apply patch set which have
dependency within. so patch set should be made in order before feed
to apply.

Fixes: kata-containers#1015

Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
@jodh-intel
Copy link
Copy Markdown

Thanks @jongwu.

/test

@devimc
Copy link
Copy Markdown

devimc commented Apr 16, 2020

/AzurePipelines run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 2 pipeline(s).

@jongwu
Copy link
Copy Markdown
Contributor Author

jongwu commented Apr 17, 2020

hi @devimc @jodh-intel any comments?

@devimc
Copy link
Copy Markdown

devimc commented Apr 17, 2020

@jongwu thanks

@devimc devimc merged commit 6988935 into kata-containers:master Apr 17, 2020
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.

fix obs ci apply patch out of order issue

3 participants