Commit Graph

4 Commits (f7a375b9dc368f29c8cdca3cb7f62b884780d17a)

Author SHA1 Message Date
Paul Spooren f7a375b9dc switch $TYPE logic to work during tests
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>
2021-02-27 23:26:59 -10:00
Paul Spooren 93cf40e2d1 use build job names again for TARGET/ARCH
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>
2021-02-26 21:47:49 -10:00
Paul Spooren ca13177b56 simplify ARCH/TARGET variables
Instead of extracting ARCH/TARGET from the build name explicitly export
the variables to simplify the code. If not, it requires extra handling
for tagging which nulls the "simplification".

Signed-off-by: Paul Spooren <mail@aparcar.org>
2021-02-24 11:56:25 -10:00
Paul Spooren baf01edb31 refactor build scripts
* 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>
2021-02-23 19:53:22 -10:00