aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/ci-apps-verify/app-projects.yaml.inc3
-rw-r--r--jjb/ci-apps-verify/ci-apps-jjb.yaml1
-rw-r--r--jjb/common/include-agl-app-run-test-short.sh2
-rw-r--r--jjb/common/include-agl-run-test-short.sh6
-rw-r--r--jjb/common/include-agl-send-email-report.sh8
-rw-r--r--jjb/common/include-agl-source-aglsetup.sh12
-rw-r--r--jjb/common/include-apps-fetch-install-sdk.sh9
-rw-r--r--packer/provision/agl_dependencies.sh5
8 files changed, 37 insertions, 9 deletions
diff --git a/jjb/ci-apps-verify/app-projects.yaml.inc b/jjb/ci-apps-verify/app-projects.yaml.inc
index 9c0b4201..b23f79d1 100644
--- a/jjb/ci-apps-verify/app-projects.yaml.inc
+++ b/jjb/ci-apps-verify/app-projects.yaml.inc
@@ -1,4 +1,5 @@
- agl-cluster-demo-dashboard
+- agl-cluster-demo-gauges
- agl-cluster-demo-receiver
- agl-service-audio-4a
- agl-service-audiomixer
@@ -33,6 +34,7 @@
- agl-service-taskmanager
- agl-service-telephony
- agl-service-unicens
+- agl-service-unicens-controller
- agl-service-voice-high
- agl-service-voice-high-capabilities
- agl-service-weather
@@ -65,6 +67,7 @@
- messaging
- mixer
- navigation
+- ondemandnavi
- onscreenapp
- phone
- radio
diff --git a/jjb/ci-apps-verify/ci-apps-jjb.yaml b/jjb/ci-apps-verify/ci-apps-jjb.yaml
index 1fccd1b3..46f16ab0 100644
--- a/jjb/ci-apps-verify/ci-apps-jjb.yaml
+++ b/jjb/ci-apps-verify/ci-apps-jjb.yaml
@@ -3,6 +3,7 @@
name: ci-apps-AGL
aglbranch:
- master
+ - halibut
- guppy
- flounder
architecture:
diff --git a/jjb/common/include-agl-app-run-test-short.sh b/jjb/common/include-agl-app-run-test-short.sh
index 7a8f59e5..a9c6f40f 100644
--- a/jjb/common/include-agl-app-run-test-short.sh
+++ b/jjb/common/include-agl-app-run-test-short.sh
@@ -34,7 +34,7 @@ CREATE_ARGS+="--build-type snapshot --branch master --version latest "
[[ ! -z $GERRIT_CHANGE_NUMBER ]] && CREATE_ARGS+="--app-changeid $GERRIT_CHANGE_NUMBER "
[[ ! -z $GERRIT_PATCHSET_NUMBER ]] && CREATE_ARGS+="--app-patchset $GERRIT_PATCHSET_NUMBER "
[[ ! -z $AGLBRANCH ]] && CREATE_ARGS+="--app-branch $AGLBRANCH "
-BUILD_VERSION="AGL-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER"
+BUILD_VERSION="AGL-app-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER"
[[ -e output/repo-manifest-r.txt.sha1 ]] && BUILD_VERSION+="-$(cat output/repo-manifest-r.txt.sha1)"
CREATE_ARGS+="--name AGL-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER "
CREATE_ARGS+="--build-version $BUILD_VERSION "
diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh
index 95db4875..2358d1c5 100644
--- a/jjb/common/include-agl-run-test-short.sh
+++ b/jjb/common/include-agl-run-test-short.sh
@@ -27,7 +27,11 @@ CREATE_ARGS+="--machine ${releng_device} "
CREATE_ARGS+="--build-type ci "
[[ ! -z $GERRIT_CHANGE_NUMBER ]] && CREATE_ARGS+="--changeid $GERRIT_CHANGE_NUMBER "
[[ ! -z $GERRIT_PATCHSET_NUMBER ]] && CREATE_ARGS+="--patchset $GERRIT_PATCHSET_NUMBER "
-CREATE_ARGS+="--name AGL-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER "
+if [[ ! -z $DIST_BUILD_TOPIC ]]; then
+ CREATE_ARGS+="--name $DIST_BUILD_TOPIC "
+else
+ CREATE_ARGS+="--name AGL-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER "
+fi
[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION-${DIST_LAYERS_MD5:0:8} "
[[ ! -z $DIST_BUILD_HASH ]] && CREATE_ARGS+="--commit $DIST_BUILD_HASH "
[[ ! -z $DIST_BUILD_ID ]] && CREATE_ARGS+="--build-id $DIST_BUILD_ID "
diff --git a/jjb/common/include-agl-send-email-report.sh b/jjb/common/include-agl-send-email-report.sh
index 82582e24..01daea34 100644
--- a/jjb/common/include-agl-send-email-report.sh
+++ b/jjb/common/include-agl-send-email-report.sh
@@ -24,8 +24,12 @@ if [ -n "$KCI_EMAIL_AUTH_TOKEN" ]; then
KCI_API='http://kernelci.dev.baylibre.com:8081'
TREE_NAME='AGL-yocto'
BRANCH=$DIST_BB_AGL_BRANCH
- GIT_DESCRIBE=$DIST_BB_DISTRO_VERSION-${DIST_LAYERS_MD5:0:8}
+ if [[ ! -z $DIST_BUILD_TOPIC ]]; then
+ GIT_DESCRIBE=$DIST_BUILD_TOPIC
+ else
+ GIT_DESCRIBE=$DIST_BB_DISTRO_VERSION-${DIST_LAYERS_MD5:0:8}
+ fi
PLAN='agl-testplan'
curl -X POST -H "Authorization: $KCI_EMAIL_AUTH_TOKEN" -H "Content-Type: application/json" -d '{"job": "'$TREE_NAME'", "kernel": "'$GIT_DESCRIBE'", "git_branch": "'$BRANCH'", "report_type": "test", "plan": "'$PLAN'", "send_to": ["automotive-testreports@lists.linuxfoundation.org"], "format": ["txt"], "delay": 3600}' ${KCI_API}/send
echo "The test email reportS will be sent with a delay of 1 hour "
-fi \ No newline at end of file
+fi
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
diff --git a/jjb/common/include-apps-fetch-install-sdk.sh b/jjb/common/include-apps-fetch-install-sdk.sh
index 42847c4f..f91a6836 100644
--- a/jjb/common/include-apps-fetch-install-sdk.sh
+++ b/jjb/common/include-apps-fetch-install-sdk.sh
@@ -19,13 +19,14 @@ 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
+set +x
# default to release
-SDKBASEURL="http://download.automotivelinux.org/AGL/release/${AGLBRANCH}/latest/${TARGETSDKMACHINE}/deploy/sdk/"
+SDKBASEURL="http://mirror.automotivelinux.org/AGL/release/${AGLBRANCH}/latest/${TARGETSDKMACHINE}/deploy/sdk/"
# but master uses snapshot
if test x"master" = x"$AGLBRANCH" ; then
- SDKBASEURL="http://download.automotivelinux.org/AGL/snapshots/master/latest/${TARGETSDKMACHINE}/deploy/sdk/"
+ SDKBASEURL="http://mirror.automotivelinux.org/AGL/snapshots/master/latest/${TARGETSDKMACHINE}/deploy/sdk/"
fi
# special case for dab
if test x"dab" = x"$AGLBRANCH" ; then
@@ -33,7 +34,7 @@ if test x"dab" = x"$AGLBRANCH" ; then
echo "Skipping aarch64 .... "
exit 0
fi
- SDKBASEURL="http://download.automotivelinux.org/AGL/release/dab/latest/${TARGETSDKMACHINE}/deploy/sdk/"
+ SDKBASEURL="http://mirror.automotivelinux.org/AGL/release/dab/latest/${TARGETSDKMACHINE}/deploy/sdk/"
fi
@@ -46,7 +47,7 @@ if test x"" = x"${TARGETSDKNAME}" ; then
exit 0
#exit 1
fi
-
+set -x
if test ! -f ${TARGETSDKNAME} ; then
echo "Downloading $TARGETSDKNAME for $MACHINE"
wget -nd -c "${SDKBASEURL}/${TARGETSDKNAME}"
diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh
index 2fdc74bc..7470676f 100644
--- a/packer/provision/agl_dependencies.sh
+++ b/packer/provision/agl_dependencies.sh
@@ -35,6 +35,11 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y -t jessie-backports lava-tool=
# Adding stretch-backports for lavacli
echo "deb https://apt.lavasoftware.org/release stretch-backports main" >> /etc/apt/sources.list
+wget https://apt.lavasoftware.org/lavasoftware.key.asc
+sudo apt-key add lavasoftware.key.asc
+rm lavasoftware.key.asc
+#sudo apt-key adv --recv-key --keyserver keyserver.ubuntu.com A791358F2E49B100
+
DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -t stretch-backports lavacli
# we have a build blocker wrt useradd - I assume it is caused by /bin/sh being dash