diff options
| author |   Kevin Hilman <khilman@baylibre.com> | 2019-07-18 09:50:02 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2019-07-19 09:52:45 -0700 |
| commit | 1d88324e893c0d46eeaa83a7889271bc3e89d0e3 (patch) | |
| tree | 08f6ffed30f4644ecabca1c00424abff854bb5c3 | |
| parent | e4a5da8ff2d49d9a85d9cc0db20a995d557fec68 (diff) | |
jjb/common: aglsetup: use topic if available
If aglsetup.sh is a new enough version, use the --topic option to set
a unique topic string.
TODO: support release/snapshot builds as well as CI builds.
Bug-AGL: SPEC-2646
Change-Id: I599063f349cc98e3f11b97201edebe7431012dd1
Suggested-by: Stephane Desneux <stephane.desneux@iot.bzh>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
| -rw-r--r-- | jjb/common/include-agl-source-aglsetup.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/jjb/common/include-agl-source-aglsetup.sh b/jjb/common/include-agl-source-aglsetup.sh index 2b010e1b..44b6ae6c 100644 --- a/jjb/common/include-agl-source-aglsetup.sh +++ b/jjb/common/include-agl-source-aglsetup.sh @@ -4,9 +4,19 @@ ################################################################################ ## Source the aglsetup script ################################################################################ +SETUP_OPTS="" + +# check aglsetup version +source meta-agl/scripts/aglsetup.sh --version >/dev/null 2>&1 || AGLSETUP_VERSION=1.0.0 + +# add setup topic (if new enough version) +TOPIC_SUPPORT_VER=1.2.0 +if [[ "$(echo -e "$AGLSETUP_VERSION\n$TOPIC_SUPPORT_VER" | sort -V | head -n1)" == $TOPIC_SUPPORT_VER ]]; then + SETUP_OPTS="--topic change-${GERRIT_CHANGE_NUMBER}-${GERRIT_PATCHSET_NUMBER}" +fi # source the env -source meta-agl/scripts/aglsetup.sh -m ${MACHINE} -b output ${TARGETFEATURES} +source meta-agl/scripts/aglsetup.sh ${SETUP_OPTS} -m ${MACHINE} -b output ${TARGETFEATURES} # link the shared downloads and sstate-cache ln -sf ../../downloads |