| Age | Commit message (Collapse) | Author |
|---|
|
Moved defaults away from argparser to `defaults.py`. This unlocks the ability to
pass values that can be defined as command line arguments via a config file.
With this change logic looks like this (in order of overrides).
Pre-build config:
`data/defaults.toml` -> `build-flavors/<flavor>.toml` ->
`--<command line argument>`
Build config:
`defaults.py` -> `data/defaults.toml` -> `build-types/<type>.toml` ->
`architectures/<architecture>.toml` -> `build-flavors/<flavor>.toml` ->
`--<command line argument>`
|
|
The previous version did not work for all flavor types. This one should be
universal.
|
|
Mark artifacts with a flavor name for better clarity.
|
|
|
|
build: T3664: include the architecture field in version data
|
|
|
|
build: T3664: include build flavor name in the version file
|
|
to make it clear what is merged into what
|
|
|
|
Added two new options:
- `image_ext`. Can be used if the file extension needs to be different than
the image format
- `image_opts`. Required if a target format needs extra options.
|
|
|
|
instead of setting an environment variable
|
|
|
|
|
|
|
|
|
|
|
|
build: T3664: add support for building non-ISO flavors
|
|
|
|
Fix
```
Commit title '{title}' does not match the required format!
```
|
|
Signed-off-by: Daniil Baturin <daniil@vyos.io>
|
|
Signed-off-by: Daniil Baturin <daniil@vyos.io>
|
|
and normalize it to a list if only one format is specified
|
|
to avoid mistakenly listing auixilliary files like README
as flavors
|
|
Signed-off-by: Daniil Baturin <daniil@vyos.io>
|
|
Commit 611cfc85c531 ("T6173: validate allowed characters in ISO image name")
missed the probability that version is a dict member bot empty.
|
|
The `check-pr-title-and-commit-messages.py` that used for the action
is not exists.
Add this script.
|
|
|
|
T6173: validate allowed characters in ISO image name
|
|
Building custom VyOS version: 1.5-asdf%-202404081841
I: Checking if packages required for VyOS image build are installed
Version contained illegal character(s), allowed: abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-+
|
|
|
|
|
|
to avoid a mix of image build scripts and ancilliary scripts in the same directory
|
|
|
|
|
|
T6115: Fix tagged builds from detached Git HEAD
|
|
|
|
to allow people to easily include a custom default config
|
|
for a compliant implementation ot TOML
|
|
build: T4919: Fix error due to variable not found
|
|
|
|
config: T4919: Add emulated TPM encryption test
|
|
Use single source for project related URLs that will later be consumed by the
MOTD template used.
|
|
|
|
Commit 3979b25dcf ("T3664: initial implementation of the build flavor system")
removed the call to make-version-file, thus we can also drop the file itself.
|
|
This was discussed in slack, where a user was missing the Git commit ID in his
custom build
Reason is/was:
git clone --single-branch -b 1.4.0-epa1 https://github.com/vyos/vyos-build
Checks out the 1.4.0-epa1 tag as HEAD and does not clone any branch information.
This results in:
>>> import git
>>> repo = git.Repo('.')
>>> repo.head.object.hexsha[:14]
'bcac2eb1f9b49c'
>>> git_branch = repo.active_branch.name
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
File "/usr/lib/python3/dist-packages/git/repo/base.py", line 881, in active_branch
return self.head.reference
^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3/dist-packages/git/refs/symbolic.py", line 311, in _get_reference
raise TypeError("%s is a detached symbolic reference as it points to %r" % (self, sha))
TypeError: HEAD is a detached symbolic reference as it points to 'bcac2eb1f9b49cc15ebda65838e5465543dbb9c6'
during the build. The exception handler resets the branch and commit name to an empty string: https://github.com/vyos/vyos-build/blob/a3e60a00b400a1bad8609d5ce1abb0bb7abed7bc/scripts/build-vyos-image#L281-L296
This now adds a proper error message during build so it fails early.
(07:46) vyos_bld 08278c5a1172:/vyos/vyos-build # isobuild -test
Building custom VyOS version: 1.5-test-202402250746
I: Checking if packages required for VyOS image build are installed
build/config
Could not retrieve information from git: HEAD is a detached symbolic reference as it points to '39612f541e55bea19868f50f16d7a6c6e0034ed2'
|
|
|
|
to account for the current working dir
|
|
T5121: Fix, make architecture and build-type loaded from build flavor and cli arguments
|
|
Use either "make oci" or call the script manually:
$ scripts/iso-to-oci build/live-image-amd64.hybrid.iso
I: mount ISO build/live-image-amd64.hybrid.iso
I: extracting squashfs content
I: generate OCI container image vyos-1.5-strongswan-202311241125.tar
I: to import the previously generated OCI image to your local images run:
docker import vyos-1.5-strongswan-202311241125.tar vyos:1.5-strongswan-202311241125 --change 'CMD [/sbin/init]'
|
