Age | Commit message (Collapse) | Author |
|
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>
|
|
* add a functions.sh file containing functions used by all three
container types, ImageBuilder, SDK and rootfs.
* allow SDK branch tags for other branches than `master`. This allows
testing of release SDK versions
* Fix handling of special snapshot versions like `21.02-SNAPSHOT`
Future commits will move `docker-download.sh` and `docker-build.sh` do
`functions.sh`.
Signed-off-by: Paul Spooren <mail@aparcar.org>
|
|
This simplifies migration from one image name to another. In this case
we migrate from `openwrtorg` username to `openwrt`, so for a while both
should be available.
Signed-off-by: Paul Spooren <mail@aparcar.org>
|
|
By changing the FILE_HOST variable it is possible to switch to different
hosts like the CDN. Overall it makes the script easier to use for other
project which don't offer the full rsync server setup.
Signed-off-by: Paul Spooren <mail@aparcar.org>
|
|
this simplifies the CI testing
Signed-off-by: Paul Spooren <mail@aparcar.org>
|
|
This should provide useful information in the CI logs for bisect
purposes etc. Otherwise its not possible to find out which version was
used, just the CI job timestamp.
Signed-off-by: Petr Štetiar <ynezz@true.cz>
|
|
copy paste error in docker-sdk used TARGET rather than ARCH as Docker
container tag.
Signed-off-by: Paul Spooren <mail@aparcar.org>
|
|
BRANCH was missing in the generate_targets.sh script.
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>
|
|
The script tried to tag Docker images with targets like
`target/subtarget` while `/` can't be used in tag names.
Use `tr` to replace `/` with `-`.
Error message in CI:
```
Error parsing reference: "openwrtorg/sdk:cns3xxx/generic-master" is not
a valid repository/tag: invalid reference format
```
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>
|
|
Signed-off-by: Paul Spooren <mail@aparcar.org>
|
|
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>
|
|
previously multiple targets were combined in a single job so failing
targets should not stop others from being deployed. However as there are
now single builds per target this is no longer required.
Signed-off-by: Paul Spooren <mail@aparcar.org>
|
|
In ./docker-download.sh:
SC2086: Double quote to prevent globbing and word splitting.
SC2086: Double quote to prevent globbing and word splitting.
SC2086: Double quote to prevent globbing and word splitting.
In ./gen-targets.sh:
SC2188: This redirection doesn't have a command. Move to its command (or use 'true' as no-op).
SC2027: The surrounding quotes actually unquote this. Remove or escape them.
SC2086: Double quote to prevent globbing and word splitting.
SC2188: This redirection doesn't have a command. Move to its command (or use 'true' as no-op).
SC2027: The surrounding quotes actually unquote this. Remove or escape them.
SC2086: Double quote to prevent globbing and word splitting.
SC2027: The surrounding quotes actually unquote this. Remove or escape them.
SC2086: Double quote to prevent globbing and word splitting.
In ./docker-imagebuilder.sh:
SC2155: Declare and assign separately to avoid masking return values.
SC2086: Double quote to prevent globbing and word splitting.
SC2155: Declare and assign separately to avoid masking return values.
SC2086: Double quote to prevent globbing and word splitting.
SC2105: continue is only valid in loops.
In ./docker-rootfs.sh:
SC2039: In POSIX sh, == in place of = is undefined.
SC2155: Declare and assign separately to avoid masking return values.
SC2086: Double quote to prevent globbing and word splitting.
SC2155: Declare and assign separately to avoid masking return values.
SC2086: Double quote to prevent globbing and word splitting.
SC2105: continue is only valid in loops.
In ./docker-sdk.sh line:
SC2155: Declare and assign separately to avoid masking return values.
SC2086: Double quote to prevent globbing and word splitting.
SC2155: Declare and assign separately to avoid masking return values.
SC2086: Double quote to prevent globbing and word splitting.
SC2105: continue is only valid in loops.
Signed-off-by: Petr Štetiar <ynezz@true.cz>
|
|
This improves readability as it auto generates the target list.
|
|
ImageBuilder/SDKs are build for each target + master & 19.07-snapshot
branch. This is to much for most CI runners, this separates the job and
also allows running it in parrallel if more workers are available.
Also add PGP key for 19.07 release builds.
Introduce $CI_COMMIT_REF_SLUG for testing.
Introduce $SKIP_ROOTFS for older builds not supporting docker images.
Signed-off-by: Paul Spooren <mail@aparcar.org>
|
|
Eventually this CI could move to GitLab, so start with some testing.
Signed-off-by: Paul Spooren <mail@aparcar.org>
|
|
both setups are similar enough to be unified.
Signed-off-by: Paul Spooren <mail@aparcar.org>
|
|
docker-download.sh - Downloads FILE_DOWNLOAD from FILE_HOST and verifies
docker-upload.sh - Uploads the created docker images to docker.io
Signed-off-by: Paul Spooren <mail@aparcar.org>
|
|
This was done to make shellcheck happy, however resulted in broken
images.
Signed-off-by: Paul Spooren <mail@aparcar.org>
|
|
Just for good style.
Signed-off-by: Paul Spooren <mail@aparcar.org>
|
|
This way one can run openwrtorg/rootfs instead of
openwrtorg/rootfs:x86-64. This makes sense as it's the most common use
case.
Signed-off-by: Paul Spooren <mail@aparcar.org>
|
|
Initial push to use openwrtorg. Generatres rootfs, sdk and imagebuilder
for now.
Signed-off-by: Paul Spooren <mail@aparcar.org>
|