search

kata-containers / packaging

Kata Containers version 1.x packaging (for version 2.x see https://github.com/kata-containers/kata-containers).
https://katacontainers.io/
Apache License 2.0
119 stars 92 forks source link

static-build: Use apply_patches.sh in qemu and kernel scripts #1162

Closed wainersm closed 3 years ago

wainersm commented 3 years ago

Creates a common script to the qemu and qemu-virtiofs build processes to ensure the patches are applied of same way.

Backport of github.com/kata-containers/kata-containers/pull/787, with the three commits squashed.

Fixes: #786

Signed-off-by: Wainer dos Santos Moschetta wainersm@redhat.com

wainersm commented 3 years ago

Hi @jodh-intel ! Since this is a back-port of already merged github.com/kata-containers/kata-containers/pull/787 , I think I should implement your suggestions on the original tree first so that the code do not diverge and future back-ports can be made easily. Any objection?

jodh-intel commented 3 years ago

@wainersm - agreed! I've raised https://github.com/kata-containers/kata-containers/issues/1014 to handle the improvements.

wainersm commented 3 years ago

/test-ubuntu-18-04

wainersm commented 3 years ago

/test-ubuntu

wainersm commented 3 years ago

@jodh-intel @fidencio am I allowed to trigger the obs-packaging-ci job? If yes, how?

wainersm commented 3 years ago

/AzurePipelines run

azure-pipelines[bot] commented 3 years ago
Commenter does not have sufficient privileges for PR 1162 in repo kata-containers/packaging
wainersm commented 3 years ago

@jodh-intel I decided to include the backport of https://github.com/kata-containers/kata-containers/pull/1025 in this same PR, so we have the change in a single place.

wainersm commented 3 years ago

/test ubuntu

jcvenegas commented 3 years ago

/AzurePipelines run

azure-pipelines[bot] commented 3 years ago
Azure Pipelines successfully started running 2 pipeline(s).
wainersm commented 3 years ago

The jenkins-ci-ubuntu-18-04 failed because of a checking in the kernel files:

16:37:38 Check Changes in kernel
16:37:38 kernel/build-kernel.sh
16:37:38 scripts/apply_patches.sh
16:37:38 static-build/qemu-virtiofs/Dockerfile
16:37:38 static-build/qemu/Dockerfile
16:37:38 Kernel directory has changes check kernel/kata_config_version changed
16:37:38 ERROR: Please bump version in kernel/kata_config_version

Should any updated file (including build scripts and README) in the kernel directory drive to kata_config_version increment?

jodh-intel commented 3 years ago

Should any updated file (including build scripts and README) in the kernel directory drive to kata_config_version increment?

@wainersm - yes: https://github.com/kata-containers/packaging/blob/master/.ci/test.sh#L39..L56 :)

wainersm commented 3 years ago

/test ubuntu

amshinde commented 3 years ago

/AzurePipelines run

azure-pipelines[bot] commented 3 years ago
Azure Pipelines successfully started running 2 pipeline(s).
jcvenegas commented 3 years ago

@wainersm could you backport to stable-1.11 and stable-1.12 as well ?

wainersm commented 3 years ago

@wainersm could you backport to stable-1.11 and stable-1.12 as well ?

yes @jcvenegas , I will backport to those branches as well.