packaging: Don't build the confidential / sev kernel twice -- part III #9001

fidencio · 2024-02-02T10:08:52Z

Those are fix ups to ensure that the work merged as part of #8987 works correctly.

Here are the local tests with these patches in:

⋊> kata-containers on topic/fix-cache-for-confidential-kernel-part-III ≡ make kernel-tarball
make kernel-tarball-build
make[1]: Entering directory '/home/ffidenci/src/upstream/kata-containers/kata-containers'
/home/ffidenci/src/upstream/kata-containers/kata-containers/tools/packaging/kata-deploy/local-build//kata-deploy-binaries-in-docker.sh  --build=kernel
sha256:17f85480ef404c1533f7fe4d1dc1ccf371df074f33e0894dfb5c8983e6feb268
Build kata version 3.3.0-alpha0: kernel
INFO: DESTDIR /home/ffidenci/src/upstream/kata-containers/kata-containers/tools/packaging/kata-deploy/local-build/build/kernel/destdir
Downloading 8f71e2b0fe63 kernel-builder-image-version
Downloading 107f76619e2a kata-static-kernel.tar.xz
Downloading 216843ea6ed0 kernel-version
Downloaded  8f71e2b0fe63 kernel-builder-image-version
Downloading efd423ff12dc kernel-sha256sum
Downloaded  216843ea6ed0 kernel-version
Downloaded  efd423ff12dc kernel-sha256sum
Downloaded  107f76619e2a kata-static-kernel.tar.xz
Pulled [registry] ghcr.io/kata-containers/cached-artefacts/kernel:latest-main-x86_64
Digest: sha256:a770d0debba8026f81700841f5e64f3877735a6657d9236583f9c9a21db0ccb6
kata-static-kernel.tar.xz: OK
INFO: Using cached tarball of kernel
drwxr-xr-x runner/runner     0 2024-02-02 09:28 ./
drwxr-xr-x root/root         0 2024-02-02 09:28 ./opt/
drwxr-xr-x root/root         0 2024-02-02 09:28 ./opt/kata/
drwxr-xr-x root/root         0 2024-02-02 09:28 ./opt/kata/share/
drwxr-xr-x root/root         0 2024-02-02 09:28 ./opt/kata/share/kata-containers/
-rw-r--r-- root/root   6702032 2024-02-02 09:28 ./opt/kata/share/kata-containers/vmlinuz-6.1.62-123
lrwxrwxrwx root/root         0 2024-02-02 09:28 ./opt/kata/share/kata-containers/vmlinux.container -> vmlinux-6.1.62-123
-rw-r--r-- root/root     76921 2024-02-02 09:28 ./opt/kata/share/kata-containers/config-6.1.62-123
lrwxrwxrwx root/root         0 2024-02-02 09:28 ./opt/kata/share/kata-containers/vmlinuz.container -> vmlinuz-6.1.62-123
-rw-r--r-- root/root  44796144 2024-02-02 09:28 ./opt/kata/share/kata-containers/vmlinux-6.1.62-123
~/src/upstream/kata-containers/kata-containers/tools/packaging/kata-deploy/local-build/build ~/src/upstream/kata-containers/kata-containers/tools/packaging/kata-deploy/local-build/build/kernel/builddir
~/src/upstream/kata-containers/kata-containers/tools/packaging/kata-deploy/local-build/build/kernel/builddir
make[1]: Leaving directory '/home/ffidenci/src/upstream/kata-containers/kata-containers'

⋊> kata-containers on topic/fix-cache-for-confidential-kernel-part-III ≡ make kernel-confidential-tarball
make kernel-confidential-tarball-build
make[1]: Entering directory '/home/ffidenci/src/upstream/kata-containers/kata-containers'
/home/ffidenci/src/upstream/kata-containers/kata-containers/tools/packaging/kata-deploy/local-build//kata-deploy-binaries-in-docker.sh  --build=kernel-confidential
sha256:2fce5fdc714a0f688b2d4266a29c5d6e18ca3b2f1a74da077736d128db405fba
Build kata version 3.3.0-alpha0: kernel-confidential
INFO: DESTDIR /home/ffidenci/src/upstream/kata-containers/kata-containers/tools/packaging/kata-deploy/local-build/build/kernel-confidential/destdir
Downloading 7602529452de kernel-confidential-version
Downloading 09117eec91c7 kata-static-kernel-confidential-modules.tar.xz
Downloading 8f71e2b0fe63 kernel-confidential-builder-image-version
Downloaded  8f71e2b0fe63 kernel-confidential-builder-image-version
Downloading 98ddaeaddd71 kernel-confidential-sha256sum
Downloaded  7602529452de kernel-confidential-version
Downloaded  98ddaeaddd71 kernel-confidential-sha256sum
Downloaded  09117eec91c7 kata-static-kernel-confidential-modules.tar.xz
Restored    09117eec91c7 kata-static-kernel-confidential.tar.xz
Pulled [registry] ghcr.io/kata-containers/cached-artefacts/kernel-confidential:latest-main-x86_64
Digest: sha256:9301b7cb9dddd66e0fbea53a8b7d8d0250cc92a70595b71a2665faa95d3cf2eb
kata-static-kernel-confidential.tar.xz: OK
INFO: Using cached tarball of kernel-confidential
./
./opt/
./opt/kata/
./opt/kata/share/
./opt/kata/share/kata-containers/
./opt/kata/share/kata-containers/config-6.7-123-confidential
./opt/kata/share/kata-containers/vmlinux-confidential.container
./opt/kata/share/kata-containers/vmlinuz-6.7-123-confidential
./opt/kata/share/kata-containers/vmlinux-6.7-123-confidential
./opt/kata/share/kata-containers/vmlinuz-confidential.container
drwxr-xr-x runner/runner     0 2024-02-02 09:29 ./
drwxr-xr-x root/root         0 2024-02-02 09:29 ./opt/
drwxr-xr-x root/root         0 2024-02-02 09:29 ./opt/kata/
drwxr-xr-x root/root         0 2024-02-02 09:29 ./opt/kata/share/
drwxr-xr-x root/root         0 2024-02-02 09:29 ./opt/kata/share/kata-containers/
-rw-r--r-- root/root     85597 2024-02-02 09:29 ./opt/kata/share/kata-containers/config-6.7-123-confidential
lrwxrwxrwx root/root         0 2024-02-02 09:29 ./opt/kata/share/kata-containers/vmlinux-confidential.container -> vmlinux-6.7-123-confidential
-rw-r--r-- root/root   7380992 2024-02-02 09:29 ./opt/kata/share/kata-containers/vmlinuz-6.7-123-confidential
-rw-r--r-- root/root  41283984 2024-02-02 09:29 ./opt/kata/share/kata-containers/vmlinux-6.7-123-confidential
lrwxrwxrwx root/root         0 2024-02-02 09:29 ./opt/kata/share/kata-containers/vmlinuz-confidential.container -> vmlinuz-6.7-123-confidential
drwxr-xr-x runner/runner     0 2024-02-02 09:29 ./
drwxr-xr-x root/root         0 2024-02-02 09:29 ./opt/
drwxr-xr-x root/root         0 2024-02-02 09:29 ./opt/kata/
drwxr-xr-x root/root         0 2024-02-02 09:29 ./opt/kata/share/
drwxr-xr-x root/root         0 2024-02-02 09:29 ./opt/kata/share/kata-containers/
-rw-r--r-- root/root     85597 2024-02-02 09:29 ./opt/kata/share/kata-containers/config-6.7-123-confidential
lrwxrwxrwx root/root         0 2024-02-02 09:29 ./opt/kata/share/kata-containers/vmlinux-confidential.container -> vmlinux-6.7-123-confidential
-rw-r--r-- root/root   7380992 2024-02-02 09:29 ./opt/kata/share/kata-containers/vmlinuz-6.7-123-confidential
-rw-r--r-- root/root  41283984 2024-02-02 09:29 ./opt/kata/share/kata-containers/vmlinux-6.7-123-confidential
lrwxrwxrwx root/root         0 2024-02-02 09:29 ./opt/kata/share/kata-containers/vmlinuz-confidential.container -> vmlinuz-6.7-123-confidential
~/src/upstream/kata-containers/kata-containers/tools/packaging/kata-deploy/local-build/build ~/src/upstream/kata-containers/kata-containers/tools/packaging/kata-deploy/local-build/build/kernel-confidential/builddir
~/src/upstream/kata-containers/kata-containers/tools/packaging/kata-deploy/local-build/build/kernel-confidential/builddir
make[1]: Leaving directory '/home/ffidenci/src/upstream/kata-containers/kata-containers'

⋊> kata-containers on topic/fix-cache-for-confidential-kernel-part-III ≡ make kernel-sev-tarball
make kernel-sev-tarball-build
make[1]: Entering directory '/home/ffidenci/src/upstream/kata-containers/kata-containers'
/home/ffidenci/src/upstream/kata-containers/kata-containers/tools/packaging/kata-deploy/local-build//kata-deploy-copy-yq-installer.sh
/home/ffidenci/src/upstream/kata-containers/kata-containers/tools/packaging/kata-deploy/local-build//kata-deploy-binaries-in-docker.sh  --build=kernel-sev
sha256:17f85480ef404c1533f7fe4d1dc1ccf371df074f33e0894dfb5c8983e6feb268
Build kata version 3.3.0-alpha0: kernel-sev
INFO: DESTDIR /home/ffidenci/src/upstream/kata-containers/kata-containers/tools/packaging/kata-deploy/local-build/build/kernel-sev/destdir
INFO: build sev kernel
Downloading 66ac785c4bbb kata-static-kernel-sev-modules.tar.xz
Downloading e693f4bbb23b kernel-sev-version
Downloading 8f71e2b0fe63 kernel-sev-builder-image-version
Downloaded  8f71e2b0fe63 kernel-sev-builder-image-version
Downloading 038e470ffe03 kernel-sev-sha256sum
Downloaded  e693f4bbb23b kernel-sev-version
Downloaded  038e470ffe03 kernel-sev-sha256sum
Downloaded  66ac785c4bbb kata-static-kernel-sev-modules.tar.xz
Restored    66ac785c4bbb kata-static-kernel-sev.tar.xz
Pulled [registry] ghcr.io/kata-containers/cached-artefacts/kernel-sev:latest-main-x86_64
Digest: sha256:c63df7f1d95ab52af48bdb3ee248de5b3b9f59df128d9dd2a6ceba56cd6a3547
kata-static-kernel-sev.tar.xz: OK
INFO: Using cached tarball of kernel-sev
./
./opt/
./opt/kata/
./opt/kata/share/
./opt/kata/share/kata-containers/
./opt/kata/share/kata-containers/vmlinux-sev.container
./opt/kata/share/kata-containers/vmlinuz-5.19.2-123-sev
./opt/kata/share/kata-containers/vmlinuz-sev.container
./opt/kata/share/kata-containers/config-5.19.2-123-sev
./opt/kata/share/kata-containers/vmlinux-5.19.2-123-sev
drwxr-xr-x runner/runner     0 2024-02-02 09:29 ./
drwxr-xr-x root/root         0 2024-02-02 09:29 ./opt/
drwxr-xr-x root/root         0 2024-02-02 09:29 ./opt/kata/
drwxr-xr-x root/root         0 2024-02-02 09:29 ./opt/kata/share/
drwxr-xr-x root/root         0 2024-02-02 09:29 ./opt/kata/share/kata-containers/
lrwxrwxrwx root/root         0 2024-02-02 09:29 ./opt/kata/share/kata-containers/vmlinux-sev.container -> vmlinux-5.19.2-123-sev
-rw-r--r-- root/root   6820288 2024-02-02 09:29 ./opt/kata/share/kata-containers/vmlinuz-5.19.2-123-sev
lrwxrwxrwx root/root         0 2024-02-02 09:29 ./opt/kata/share/kata-containers/vmlinuz-sev.container -> vmlinuz-5.19.2-123-sev
-rw-r--r-- root/root     79027 2024-02-02 09:29 ./opt/kata/share/kata-containers/config-5.19.2-123-sev
-rw-r--r-- root/root  56129552 2024-02-02 09:29 ./opt/kata/share/kata-containers/vmlinux-5.19.2-123-sev
drwxr-xr-x runner/runner     0 2024-02-02 09:29 ./
drwxr-xr-x root/root         0 2024-02-02 09:29 ./opt/
drwxr-xr-x root/root         0 2024-02-02 09:29 ./opt/kata/
drwxr-xr-x root/root         0 2024-02-02 09:29 ./opt/kata/share/
drwxr-xr-x root/root         0 2024-02-02 09:29 ./opt/kata/share/kata-containers/
lrwxrwxrwx root/root         0 2024-02-02 09:29 ./opt/kata/share/kata-containers/vmlinux-sev.container -> vmlinux-5.19.2-123-sev
-rw-r--r-- root/root   6820288 2024-02-02 09:29 ./opt/kata/share/kata-containers/vmlinuz-5.19.2-123-sev
lrwxrwxrwx root/root         0 2024-02-02 09:29 ./opt/kata/share/kata-containers/vmlinuz-sev.container -> vmlinuz-5.19.2-123-sev
-rw-r--r-- root/root     79027 2024-02-02 09:29 ./opt/kata/share/kata-containers/config-5.19.2-123-sev
-rw-r--r-- root/root  56129552 2024-02-02 09:29 ./opt/kata/share/kata-containers/vmlinux-5.19.2-123-sev
~/src/upstream/kata-containers/kata-containers/tools/packaging/kata-deploy/local-build/build ~/src/upstream/kata-containers/kata-containers/tools/packaging/kata-deploy/local-build/build/kernel-sev/builddir
~/src/upstream/kata-containers/kata-containers/tools/packaging/kata-deploy/local-build/build/kernel-sev/builddir
make[1]: Leaving directory '/home/ffidenci/src/upstream/kata-containers/kata-containers'

fidencio · 2024-02-02T10:09:04Z

/test

stevenhorsman

LGTM

gkurz

packaing: Fix typo to get the extra_tarballs path

First commit has a typo in the title.

It should've been "${m#*:}" instead of "${m#&:}". Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>

I made this a required argument during the series and ended up forgetting to add that while calling the function. Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>

It should be "kernel-confidential" instead of "kernel". Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>

This was overlooked during the reviews. Fixes: kata-containers#6415 -- part III Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>

fidencio · 2024-02-02T11:42:25Z

First commit has a typo in the title.

Fixed, thanks!

fidencio · 2024-02-02T12:20:56Z

/test

gkurz

LGTM. Thanks @fidencio !

fidencio added the ok-to-test label Feb 2, 2024

stevenhorsman approved these changes Feb 2, 2024

View reviewed changes

gkurz self-requested a review February 2, 2024 11:32

gkurz reviewed Feb 2, 2024

View reviewed changes

fidencio added 4 commits February 2, 2024 12:41

packaging: Fix typo to get the extra_tarballs path

51b1df2

It should've been "${m#*:}" instead of "${m#&:}". Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>

packaging: Pass the kernel flavour to get_kernel_modules_dir

31b2109

I made this a required argument during the series and ended up forgetting to add that while calling the function. Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>

packaging: Fix kernel confidential name

228bc48

It should be "kernel-confidential" instead of "kernel". Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>

packaging: Remove trailing whitespace from extra_tarballs arg

2ff3f0a

This was overlooked during the reviews. Fixes: kata-containers#6415 -- part III Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>

fidencio force-pushed the topic/fix-cache-for-confidential-kernel-part-III branch from bed65b6 to 2ff3f0a Compare February 2, 2024 11:42

gkurz approved these changes Feb 2, 2024

View reviewed changes

fidencio merged commit 741ed1c into kata-containers:main Feb 2, 2024
274 of 293 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

packaging: Don't build the confidential / sev kernel twice -- part III #9001

packaging: Don't build the confidential / sev kernel twice -- part III #9001

fidencio commented Feb 2, 2024

fidencio commented Feb 2, 2024

stevenhorsman left a comment

gkurz left a comment

fidencio commented Feb 2, 2024

fidencio commented Feb 2, 2024

gkurz left a comment

packaging: Don't build the confidential / sev kernel twice -- part III #9001

packaging: Don't build the confidential / sev kernel twice -- part III #9001

Conversation

fidencio commented Feb 2, 2024

fidencio commented Feb 2, 2024

stevenhorsman left a comment

Choose a reason for hiding this comment

gkurz left a comment

Choose a reason for hiding this comment

fidencio commented Feb 2, 2024

fidencio commented Feb 2, 2024

gkurz left a comment

Choose a reason for hiding this comment