THe recent changes were a bit short-sighted, not putting into
consideration all labels and different behaviour during testing. This
final commit should fix building for all versions, be it snapshot, a
release snapshot or a regular point release.
Signed-off-by: Paul Spooren <mail@aparcar.org>
GitLab CI seem to lose some variables when creating downstream jobs,
revert the changes back to use the job name for target/arch and apply
the rule to SDK testing.
Remove leading `deploy` from build jobs so they are better readable in
the GitLab UI. Use the leading build name as TYPE variable, so that SDKs
are not labeled on target base and imagebuilder/rootfs is not labeled
based on arch.
For `generate_targets.sh`, instead of exporting BRANCH as env variable,
use functions.sh to set it automatically. Export the `VERSION` one
globally instead of for each downstream job. This works after removing
the `gitlab-ci.yml` variable which would previously overwrite
(strangely) the downstream job settings.
Signed-off-by: Paul Spooren <mail@aparcar.org>
Using the "latest" tag in `Dockerfile.deploy` recently updated to Docker
20.x which changed the default behaviour of `docker push`. It now
requires `--all-tags` to push all tags, unlike before in 19.x.
Signed-off-by: Paul Spooren <mail@aparcar.org>
The VERSION variable is still missing in downstream jobs even though the
documentation states it could be added like that. Add the VERSION to the
trigger job and also quote it, to avoid possible YAML parsing issues.
Adding a *depend* to the triggered job makes the CI report the
downstream success state instead of instantly marking the upstream job
as success. Meaning, if a downstream SDK or IB job fails, the upstream
job is marked as failed.
Signed-off-by: Paul Spooren <mail@aparcar.org>
The generate_targets.sh script requires to run on a specific branch to
only generate jobs for existing targets. The BRANCH variable was however
used for VERSION rather than the branch running on.
This changes the behaviour by automatically selecting the correct branch
and only taking the new VERSION env variable into account.
By doing so new Docker container tags include `snapshot` rather than
`master`, however for compatibility with existing setups the `master`
tag is still added.
Signed-off-by: Paul Spooren <mail@aparcar.org>
For the rootfs containers it can be of interest to run a root container
based on used architecture. Say a CI builds a specific architecture and
a container should run the specific packages. Instead of maintaining the
mapping upstream this should happen via container tags.
Signed-off-by: Paul Spooren <mail@aparcar.org>
Currently some deploy job fails because of hub.docker.com issues, just
retry the deploy job in such cases.
Signed-off-by: Paul Spooren <mail@aparcar.org>
Instead of having a hard coded list of available targets, this approach
makes use os the dumpinfo.pl script that automatically finds available
targets existing in the OpenWrt buildroot. The advantage is to
automatically adapt to available targets in different branches.
Additionally the tagging of SDK containers is improved. While it is
still possible to use SDK based on target tag, it is now also possible
to chose the target based on architecutre. This way less SDK container
are build as one architecutre covers multiple targets.
Signed-off-by: Paul Spooren <mail@aparcar.org>
The underscore is now used to determine the target, it was only updated
for the ImageBuilders but not SDKs. This commit fixed the deploy step
for SDKs.
Signed-off-by: Paul Spooren <mail@aparcar.org>
We've already target specified in the CI job name, so just use this
value for TARGET variable instead of duplicating the same value.
Signed-off-by: Petr Štetiar <ynezz@true.cz>
That check is currently failing due to different x86 image generation
code refactoring which changed naming of resulting images so they're now
different in master squashfs-combined Vs combined-squashfs in 19.07.
Signed-off-by: Petr Štetiar <ynezz@true.cz>
That check is currently failing due to x86 image generation code
refactoring which changed naming of resulting images.
ls: cannot access './bin/targets/x86/64/*combined-squashfs.img.gz': No such file or directory
Fixes#48
Signed-off-by: Petr Štetiar <ynezz@true.cz>
This was removed during debugging and accidently forgotten to readd. It
fails to pass if no Docker credentials are given, which would be always
the case except on openwrtorg/master. In the future a test docker hub
account should be used instead of disabling it.
Fixes: 475f2f1a97
Signed-off-by: Paul Spooren <mail@aparcar.org>
Paul Spooren
Petr Štetiar