ci: add specfic image-type for aarch64#462
Conversation
|
PSS Measurement: Memory inside container: |
Codecov Report
@@ Coverage Diff @@
## master #462 +/- ##
======================================
Coverage 64.1% 64.1%
======================================
Files 87 87
Lines 8885 8885
======================================
Hits 5696 5696
Misses 2577 2577
Partials 612 612Continue to review full report at Codecov.
|
|
lgtm, I think would be nice to follow image-type-x86_64 to follow the same conversion. But that can be done in a follow up PR because will need to modify CI scripts as well. |
versions.yaml
Outdated
| release: "20640" | ||
| meta: | ||
| image-type: "clearlinux" | ||
| image-type-aarch64: "fedora" |
There was a problem hiding this comment.
Hi @Pennyzct - thanks for raising this. I think you've hit on a limitation of the current structure of this file. As such, I think we could expand it to something like the following:
diff --git a/versions.yaml b/versions.yaml
index d616dc0..4d88730 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -76,18 +76,34 @@ assets:
Root filesystem disk image used to boot the guest virtual
machine.
url: "https://github.com/kata-containers/osbuilder"
- release: "20640"
+ architecture:
+ arm64:
+ name: "fedora"
+ version: "latest"
+ ppc64le:
+ name: "centos"
+ version: "latest"
+ x86_64:
+ name: &default-image-name "clearlinux"
+ version: "20640"
meta:
- image-type: "clearlinux"
+ image-type: *default-image-name
initrd:
description: |
Root filesystem initrd used to boot the guest virtual
machine.
url: "https://github.com/kata-containers/osbuilder"
- meta:
- base-os: "alpine"
- os-version: "3.7"
+ architecture:
+ arm64:
+ name: &default-initrd-name "alpine"
+ version: &default-initrd-version "3.7"
+ ppc64le:
+ name: *default-initrd-name
+ version: *default-initrd-version
+ x86_64:
+ name: *default-initrd-name
+ version: *default-initrd-version
kernel:
description: "Linux kernel optimised for virtual machines"Note the "references" or anchors in the above so that we can still use the query below:
$ yq read versions.yaml assets.image.meta.image-type
clearlinuxThat will ensure we don't break https://github.com/kata-containers/tests/blob/master/.ci/install_kata_image.sh#L98.
Note that in the diff above I've deleted assets.image.release as that doesn't appear to be used - could you confirm @jcvenegas, @chavafg? That value does "reappear" as assets.image.architecture.x86_64.version but since https://github.com/kata-containers/osbuilder/blob/master/rootfs-builder/clearlinux/config.sh#L9 specifies a default of "default", I wonder if we can change it here too? wdyt @jcvenegas, @chavafg?
Finally, note that I've applied the same structure change to the initrd section. @jcvenegas - can you confirm that the two elements I deleted and replaced with a new structure (assets.initrd.meta.base-os and assets.initrd.meta.os-name) are not used?
/cc @nitkon, @grahamwhaley.
There was a problem hiding this comment.
This should be a template for all involved arch😊.
There was a problem hiding this comment.
@jodh-intel Clear Linux is a distro changes a lot every day. We probably will hit some issues if we follow their latest release all the time. I'd prefer we dont follow latest automatically.
There was a problem hiding this comment.
Fair point - let's stick with a specific version for Clear Linux then.
as default image-type and initrd weren't for non-x86_64 arch, reconstructuring them to be architecture-specific. Fixes: kata-containers#461 Signed-off-by: Penny Zheng <[email protected]> Signed-off-by: Jianyong Wu <[email protected]> Signed-off-by: James O. D. Hunt <[email protected]>
|
PSS Measurement: Memory inside container: |
|
ptal 😊@jodh-intel @jcvenegas |
grahamwhaley
left a comment
grahamwhaley
left a comment
There was a problem hiding this comment.
lgtm
Adding multiple Signed-off-by is always a little strange, and I suspect you may have added @jodh-intel SoB yourself, which unless he added one before, you should probably not do...
but, I don't think is really an issue here... so we can still merge.
|
lgtm |
|
@jodh-intel will be off for 2 weeks, let's merge this without waiting for his feedback here. |
patch kata-containers#462(kata-containers/runtime#462) has been restructured under upstream review, so refining image-type to follow change. Fixes: kata-containers#472 Signed-off-by: Penny Zheng <[email protected]>
|
\o/ - nice! ;) |
|
@egernst clearly not a breaking change, but not a bug fix either. Should we backport it? |
7 participants
default image-type(aka clearlinux) couldn't work in aarch64, so we add specifc image-type to avoid jenkins set-up failure.
Fixes: #461
Signed-off-by: Penny Zheng [email protected]
Signed-off-by: Jianyong Wu [email protected]