aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/ci-AGL-verify/ci-platform-jjb.yaml28
-rw-r--r--jjb/ci-apps-verify/ci-apps-jjb.yaml2
-rw-r--r--jjb/common/include-agl-select.sh6
-rw-r--r--jjb/common/include-agl-send-email-report.sh9
-rw-r--r--jjb/common/include-apps-fetch-install-sdk.sh9
-rw-r--r--jjb/common/include-apps-header.sh4
6 files changed, 33 insertions, 25 deletions
diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
index 927a99ac..804327af 100644
--- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml
+++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
@@ -321,13 +321,13 @@
- ../common/include-agl-bitbake-image.sh
- ../common/include-agl-run-test-prepare.sh
- ../common/include-agl-run-test-rsync-changeid.sh
- publishers:
- - naginator:
- rerun-unstable-builds: true
- progressive-delay-increment: 5
- progressive-delay-maximum: 15
- max-failed-builds: 2
- #regular-expression: "Unexpected termination of the channel"
+# publishers:
+# - naginator:
+# rerun-unstable-builds: true
+# progressive-delay-increment: 5
+# progressive-delay-maximum: 15
+# max-failed-builds: 2
+# #regular-expression: "Unexpected termination of the channel"
################################################################################
@@ -550,13 +550,13 @@
- ../common/include-agl-run-test-short.sh
- ../common/include-agl-lava-jobs-submit.sh
- publishers:
- - naginator:
- max-failed-builds: 2
- rerun-unstable-builds: true
- progressive-delay-increment: 2
- progressive-delay-maximum: 6
- regular-expression: "/.*Timed out waiting for device dev-tty.*/"
+# publishers:
+# - naginator:
+# max-failed-builds: 2
+# rerun-unstable-builds: true
+# progressive-delay-increment: 2
+# progressive-delay-maximum: 6
+# regular-expression: "/.*Timed out waiting for device dev-tty.*/"
################################################################################
################################################################################
diff --git a/jjb/ci-apps-verify/ci-apps-jjb.yaml b/jjb/ci-apps-verify/ci-apps-jjb.yaml
index 45f88c88..1fccd1b3 100644
--- a/jjb/ci-apps-verify/ci-apps-jjb.yaml
+++ b/jjb/ci-apps-verify/ci-apps-jjb.yaml
@@ -7,7 +7,7 @@
- flounder
architecture:
- aarch64
- #= dragonboard-410c (disabled for dab atm)
+ #= dragonboard-410c (disabled for dab atm) later versions use qemuarm64
- x86-64
#= intel-corei7-64
#= qemux86-64
diff --git a/jjb/common/include-agl-select.sh b/jjb/common/include-agl-select.sh
index 0ba16846..c3019577 100644
--- a/jjb/common/include-agl-select.sh
+++ b/jjb/common/include-agl-select.sh
@@ -11,7 +11,11 @@ HANDLED="no"
###################
if [[ ! x"yes" = x"$HANDLED" ]] && $(echo "$TARGETPROJECT" | grep -q "^AGL/"); then
- MYPROJECT=`echo $TARGETPROJECT | sed -e "s#AGL/##g"`
+ if $(echo "$TARGETPROJECT" | grep -q "meta-renesas") ; 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
diff --git a/jjb/common/include-agl-send-email-report.sh b/jjb/common/include-agl-send-email-report.sh
index b8be71aa..84f18cc8 100644
--- a/jjb/common/include-agl-send-email-report.sh
+++ b/jjb/common/include-agl-send-email-report.sh
@@ -8,12 +8,11 @@
set -x
UPLOAD_URL_BASE=http://download.automotivelinux.org/AGL/upload/ci
-UPLOAD_URL=${UPLOAD_URL_BASE}/${GERRIT_CHANGE_NUMBER}/${GERRIT_PATCHSET_NUMBER}/qemux86-64/deploy/images/qemux86-64
+UPLOAD_URL=${UPLOAD_URL_BASE}/${GERRIT_CHANGE_NUMBER}/${GERRIT_PATCHSET_NUMBER}/qemux86-64/
-wget -q ${UPLOAD_URL}/build-info
-if [ $? != 0 ]; then
- exit 0
-fi
+set | grep MACH
+
+wget -q ${UPLOAD_URL}/build-info || exit 0
if [ ! -s build-info ]; then
exit 0
diff --git a/jjb/common/include-apps-fetch-install-sdk.sh b/jjb/common/include-apps-fetch-install-sdk.sh
index 49fb27b6..42847c4f 100644
--- a/jjb/common/include-apps-fetch-install-sdk.sh
+++ b/jjb/common/include-apps-fetch-install-sdk.sh
@@ -15,6 +15,11 @@ SDKHOSTDIR="~/agl-sdk"
# should probably switch to release ... or multiple (release/snapshot) fwiw
if test x"" = x"$AGLBRANCH"; then echo "AGLBRANCH not set, quitting" ; exit 1 ; fi
+if test x"albacore" = x"$AGLBRANCH"; then echo "Unsupported branch"; exit 0; fi
+if test x"blowfish" = x"$AGLBRANCH"; then echo "Unsupported branch"; exit 0; fi
+if test x"chinook" = x"$AGLBRANCH"; then echo "Unsupported branch"; exit 0; fi
+if test x"dab" = x"$AGLBRANCH"; then echo "Unsupported branch"; exit 0; fi
+
# default to release
SDKBASEURL="http://download.automotivelinux.org/AGL/release/${AGLBRANCH}/latest/${TARGETSDKMACHINE}/deploy/sdk/"
@@ -24,8 +29,8 @@ if test x"master" = x"$AGLBRANCH" ; then
fi
# special case for dab
if test x"dab" = x"$AGLBRANCH" ; then
- if test x"dragonboard-410c" = x"$TARGETSDKMACHINE"; then
- echo "Skipping dragonboard-410c/aarch64 .... "
+ if test x"qemuarm64" = x"$TARGETSDKMACHINE"; then
+ echo "Skipping aarch64 .... "
exit 0
fi
SDKBASEURL="http://download.automotivelinux.org/AGL/release/dab/latest/${TARGETSDKMACHINE}/deploy/sdk/"
diff --git a/jjb/common/include-apps-header.sh b/jjb/common/include-apps-header.sh
index e04ec86e..22c9b6a2 100644
--- a/jjb/common/include-apps-header.sh
+++ b/jjb/common/include-apps-header.sh
@@ -104,7 +104,7 @@ fi
case "$TARGETARCH" in
arm)
export TARGETSDKARCH="armv7ve.*hf-neon-vfpv4"
- export TARGETSDKMACHINE="raspberrypi3"
+ export TARGETSDKMACHINE="qemuarm"
;;
x86-64)
export TARGETSDKARCH="corei7-64"
@@ -112,7 +112,7 @@ case "$TARGETARCH" in
;;
aarch64)
export TARGETSDKARCH="aarch64"
- export TARGETSDKMACHINE="dragonboard-410c"
+ export TARGETSDKMACHINE="qemuarm64"
;;
esac