summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--classes/container-bundle.bbclass2
-rw-r--r--recipes-containers/vcontainer/files/blobs/vdkr/aarch64/README2
-rw-r--r--recipes-containers/vcontainer/files/blobs/vdkr/x86_64/README2
-rw-r--r--recipes-containers/vcontainer/files/blobs/vpdmn/aarch64/README2
-rw-r--r--recipes-containers/vcontainer/files/blobs/vpdmn/x86_64/README2
-rw-r--r--tests/README.md5
6 files changed, 6 insertions, 9 deletions
diff --git a/classes/container-bundle.bbclass b/classes/container-bundle.bbclass
index 406e70cc..27aa81ea 100644
--- a/classes/container-bundle.bbclass
+++ b/classes/container-bundle.bbclass
@@ -170,7 +170,7 @@ VRUNTIME_MULTICONFIG = "${@get_vruntime_multiconfig(d)}"
170VRUNTIME_MACHINE = "${@get_vruntime_machine(d)}" 170VRUNTIME_MACHINE = "${@get_vruntime_machine(d)}"
171BLOB_ARCH = "${@get_blob_arch(d)}" 171BLOB_ARCH = "${@get_blob_arch(d)}"
172 172
173# Path to vrunner.sh from vdkr-native 173# Path to vrunner.sh from vcontainer-native
174VRUNNER_PATH = "${STAGING_BINDIR_NATIVE}/vrunner.sh" 174VRUNNER_PATH = "${STAGING_BINDIR_NATIVE}/vrunner.sh"
175 175
176# Blobs come from multiconfig deploy directory 176# Blobs come from multiconfig deploy directory
diff --git a/recipes-containers/vcontainer/files/blobs/vdkr/aarch64/README b/recipes-containers/vcontainer/files/blobs/vdkr/aarch64/README
index cabb5100..eb7100ea 100644
--- a/recipes-containers/vcontainer/files/blobs/vdkr/aarch64/README
+++ b/recipes-containers/vcontainer/files/blobs/vdkr/aarch64/README
@@ -20,7 +20,7 @@ Build instructions:
20 cp tmp/deploy/images/qemuarm64/vdkr/aarch64/initramfs.cpio.gz . 20 cp tmp/deploy/images/qemuarm64/vdkr/aarch64/initramfs.cpio.gz .
21 cp tmp/deploy/images/qemuarm64/vdkr/aarch64/rootfs.img . 21 cp tmp/deploy/images/qemuarm64/vdkr/aarch64/rootfs.img .
22 22
23Once these files are present, vdkr-native will automatically include them. 23Once these files are present, vcontainer-native will automatically include them.
24 24
25Alternatively, set VDKR_USE_DEPLOY = "1" in local.conf to use blobs 25Alternatively, set VDKR_USE_DEPLOY = "1" in local.conf to use blobs
26directly from DEPLOY_DIR without copying to the layer. 26directly from DEPLOY_DIR without copying to the layer.
diff --git a/recipes-containers/vcontainer/files/blobs/vdkr/x86_64/README b/recipes-containers/vcontainer/files/blobs/vdkr/x86_64/README
index 6902f729..9a17f7b4 100644
--- a/recipes-containers/vcontainer/files/blobs/vdkr/x86_64/README
+++ b/recipes-containers/vcontainer/files/blobs/vdkr/x86_64/README
@@ -20,7 +20,7 @@ Build instructions:
20 cp tmp/deploy/images/qemux86-64/vdkr/x86_64/initramfs.cpio.gz . 20 cp tmp/deploy/images/qemux86-64/vdkr/x86_64/initramfs.cpio.gz .
21 cp tmp/deploy/images/qemux86-64/vdkr/x86_64/rootfs.img . 21 cp tmp/deploy/images/qemux86-64/vdkr/x86_64/rootfs.img .
22 22
23Once these files are present, vdkr-native will automatically include them. 23Once these files are present, vcontainer-native will automatically include them.
24 24
25Alternatively, set VDKR_USE_DEPLOY = "1" in local.conf to use blobs 25Alternatively, set VDKR_USE_DEPLOY = "1" in local.conf to use blobs
26directly from DEPLOY_DIR without copying to the layer. 26directly from DEPLOY_DIR without copying to the layer.
diff --git a/recipes-containers/vcontainer/files/blobs/vpdmn/aarch64/README b/recipes-containers/vcontainer/files/blobs/vpdmn/aarch64/README
index a4197779..b585a12a 100644
--- a/recipes-containers/vcontainer/files/blobs/vpdmn/aarch64/README
+++ b/recipes-containers/vcontainer/files/blobs/vpdmn/aarch64/README
@@ -20,7 +20,7 @@ Build instructions:
20 cp tmp/deploy/images/qemuarm64/vpdmn/aarch64/initramfs.cpio.gz . 20 cp tmp/deploy/images/qemuarm64/vpdmn/aarch64/initramfs.cpio.gz .
21 cp tmp/deploy/images/qemuarm64/vpdmn/aarch64/rootfs.img . 21 cp tmp/deploy/images/qemuarm64/vpdmn/aarch64/rootfs.img .
22 22
23Once these files are present, vpdmn-native will automatically include them. 23Once these files are present, vcontainer-native will automatically include them.
24 24
25Alternatively, set VPDMN_USE_DEPLOY = "1" in local.conf to use blobs 25Alternatively, set VPDMN_USE_DEPLOY = "1" in local.conf to use blobs
26directly from DEPLOY_DIR without copying to the layer. 26directly from DEPLOY_DIR without copying to the layer.
diff --git a/recipes-containers/vcontainer/files/blobs/vpdmn/x86_64/README b/recipes-containers/vcontainer/files/blobs/vpdmn/x86_64/README
index 30ddb445..a7d820d9 100644
--- a/recipes-containers/vcontainer/files/blobs/vpdmn/x86_64/README
+++ b/recipes-containers/vcontainer/files/blobs/vpdmn/x86_64/README
@@ -20,7 +20,7 @@ Build instructions:
20 cp tmp/deploy/images/qemux86-64/vpdmn/x86_64/initramfs.cpio.gz . 20 cp tmp/deploy/images/qemux86-64/vpdmn/x86_64/initramfs.cpio.gz .
21 cp tmp/deploy/images/qemux86-64/vpdmn/x86_64/rootfs.img . 21 cp tmp/deploy/images/qemux86-64/vpdmn/x86_64/rootfs.img .
22 22
23Once these files are present, vpdmn-native will automatically include them. 23Once these files are present, vcontainer-native will automatically include them.
24 24
25Alternatively, set VPDMN_USE_DEPLOY = "1" in local.conf to use blobs 25Alternatively, set VPDMN_USE_DEPLOY = "1" in local.conf to use blobs
26directly from DEPLOY_DIR without copying to the layer. 26directly from DEPLOY_DIR without copying to the layer.
diff --git a/tests/README.md b/tests/README.md
index 6a02678b..92719a66 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -156,11 +156,10 @@ BBMULTICONFIG = "vruntime-aarch64 vruntime-x86-64"
156 156
157| Test Class | What It Tests | Build Required | 157| Test Class | What It Tests | Build Required |
158|------------|---------------|----------------| 158|------------|---------------|----------------|
159| `TestContainerCrossTools` | container-cross-tools-native | `bitbake container-cross-tools-native` |
160| `TestContainerCrossClass` | bbclass file syntax | None (file check only) | 159| `TestContainerCrossClass` | bbclass file syntax | None (file check only) |
161| `TestOCIImageBuild` | OCI image generation | `bitbake container-app-base` (if available) | 160| `TestOCIImageBuild` | OCI image generation | `bitbake container-app-base` (if available) |
162| `TestBundledContainers` | End-to-end bundling | Full image build with `BUNDLED_CONTAINERS` | 161| `TestBundledContainers` | End-to-end bundling | Full image build with `BUNDLED_CONTAINERS` |
163| `TestVdkrRecipes` | vdkr recipe builds | `bitbake vdkr-native` | 162| `TestVdkrRecipes` | vdkr recipe builds | `bitbake vcontainer-tarball` |
164| `TestMulticonfig` | Multiconfig setup | `BBMULTICONFIG` configured | 163| `TestMulticonfig` | Multiconfig setup | `BBMULTICONFIG` configured |
165| `TestBundledContainersBoot` | **Boot image and verify containers** | Full image with Docker/Podman | 164| `TestBundledContainersBoot` | **Boot image and verify containers** | Full image with Docker/Podman |
166 165
@@ -436,8 +435,6 @@ tests/
436│ ├── TestContainerLifecycle # ps, stop, rm 435│ ├── TestContainerLifecycle # ps, stop, rm
437│ └── TestVolumeMounts # volume mount tests 436│ └── TestVolumeMounts # volume mount tests
438├── test_container_cross_install.py # Yocto integration tests 437├── test_container_cross_install.py # Yocto integration tests
439│ ├── TestContainerCrossInitramfs # blob building
440│ ├── TestContainerCrossTools # tools-native
441│ ├── TestContainerCrossClass # bbclass syntax 438│ ├── TestContainerCrossClass # bbclass syntax
442│ ├── TestOCIImageBuild # OCI generation 439│ ├── TestOCIImageBuild # OCI generation
443│ ├── TestBundledContainers # end-to-end bundling 440│ ├── TestBundledContainers # end-to-end bundling