Skip to content

Commit 898a664

Browse files
bfjeldsCopilot
andcommitted
images: remove unused config_file field; fix README show-image example
The config_file field on ImageConfig is no longer read; full_yaml_path() derives the YAML from config_path()/output_and_config. Left in place it made show-image <name> config-file return a stale default. Remove the field and update the README to show the actually-used show-image field (base-image, as the build pipeline invokes it). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 9e50bd5 commit 898a664

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

tests/images/builder/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ The following commands are supported:
100100
python3 ./testimages.py dependencies <image_name>
101101
# Build an image locally
102102
python3 ./testimages.py build <image_name>
103-
# Show key info about the image, such as name, source, config path, etc.
103+
# Show key info about the image, such as name, source, base image, etc.
104104
python3 ./testimages.py show-image <image_name> <field>
105105
# Show info on key artifacts, such as the Image Customizer version or container image
106106
python3 ./testimages.py show-artifact
@@ -117,10 +117,10 @@ To build an image with Builder or test your changes to Builder, follow these ste
117117
./testimages.py download-image <base_image_name>
118118
```
119119

120-
1. If necessary, update the Image Customizer config for the image you want to build, by modifying the corresponding YAML in `test-images/platform-integration-images`. You can also find the relevant YAML by running:
120+
1. If necessary, update the Image Customizer config for the image you want to build, by modifying the corresponding YAML in `test-images/platform-integration-images`. You can inspect fields of an image config — for example, the base image it builds on, as the build pipeline does — by running:
121121

122122
```bash
123-
python3 ./testimages.py show-image <image_name> config-file
123+
python3 ./testimages.py show-image <image_name> base-image
124124
```
125125

126126
1. Build the image:

tests/images/builder/__init__.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,6 @@ class ImageConfig:
168168
# Second-level dir, generally same as name
169169
config: str = None
170170

171-
# YAML config file inside the config dir
172-
config_file: Path = Path("base/baseimg.yaml")
173-
174171
# The base image to use
175172
base_image: BaseImage = BaseImage.BAREMETAL
176173

0 commit comments

Comments
 (0)