diff options
Diffstat (limited to 'jjb/common')
| -rw-r--r-- | jjb/common/include-agl-lava-labs-prepare.sh | 2 | ||||
| -rw-r--r-- | jjb/common/include-agl-select.sh | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/jjb/common/include-agl-lava-labs-prepare.sh b/jjb/common/include-agl-lava-labs-prepare.sh index f8a35fd6..b9355037 100644 --- a/jjb/common/include-agl-lava-labs-prepare.sh +++ b/jjb/common/include-agl-lava-labs-prepare.sh @@ -82,7 +82,7 @@ for lab in "${!labs[@]}"; do echo "lavacli: found a device available: $lavacli_line" lavacli_dev=$(echo ${arr[0]} | sed 's/\*\([^(]*\).*/\1/') lavacli_tags=$(lavacli -i $lab devices tags list $lavacli_dev | grep \*) - lavacli_tags=$(echo "$lavacli_tags" | sed 's/\* \(\)/\1/') + lavacli_tags=$(echo "$lavacli_tags" | sed 's/baylibre//' | sed 's/corelab//' | sed 's/docker//' | sed 's/\* \(\)/\1/' ) echo "Tags for $lavacli_dev: $lavacli_tags" else echo "lavacli: did not find any device available: $lavacli_line" diff --git a/jjb/common/include-agl-select.sh b/jjb/common/include-agl-select.sh index c3019577..35500b3a 100644 --- a/jjb/common/include-agl-select.sh +++ b/jjb/common/include-agl-select.sh @@ -16,6 +16,11 @@ if [[ ! x"yes" = x"$HANDLED" ]] && $(echo "$TARGETPROJECT" | grep -q "^AGL/"); t else MYPROJECT=`echo $TARGETPROJECT | sed -e "s#AGL/##g"` fi + if $(echo "$TARGETPROJECT" | grep -q "meta-agl-refhw") ; then + MYPROJECT="bsp/$(echo $TARGETPROJECT | sed -e 's#AGL/##g')" + else + MYPROJECT=`echo $TARGETPROJECT | sed -e "s#AGL/##g"` + fi if test x"AGL-repo" = x"$MYPROJECT" ; then cd .repo/manifests |