diff options
| -rw-r--r-- | jjb/common/include-agl-run-test-short.sh | 2 | ||||
| -rw-r--r-- | jjb/common/include-agl-send-email-report.sh | 2 | ||||
| -rw-r--r-- | jjb/common/include-agl-source-aglsetup.sh | 12 | ||||
| -rw-r--r-- | packer/provision/agl_dependencies.sh | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh index 1cd56dac..95db4875 100644 --- a/jjb/common/include-agl-run-test-short.sh +++ b/jjb/common/include-agl-run-test-short.sh @@ -28,7 +28,7 @@ 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 " -[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_LAYERS_MD5 " +[[ ! -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 " [[ ! -z $DIST_BB_AGL_BRANCH ]] && CREATE_ARGS+="--branch $DIST_BB_AGL_BRANCH " diff --git a/jjb/common/include-agl-send-email-report.sh b/jjb/common/include-agl-send-email-report.sh index 84f18cc8..82582e24 100644 --- a/jjb/common/include-agl-send-email-report.sh +++ b/jjb/common/include-agl-send-email-report.sh @@ -24,7 +24,7 @@ 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 + GIT_DESCRIBE=$DIST_BB_DISTRO_VERSION-${DIST_LAYERS_MD5:0:8} 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 " 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/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh index f6d23fdf..2fdc74bc 100644 --- a/packer/provision/agl_dependencies.sh +++ b/packer/provision/agl_dependencies.sh @@ -33,7 +33,7 @@ DEBIAN_FRONTEND=noninteractive apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y -t jessie-backports lava-tool=0.19-1~bpo8+1 # Adding stretch-backports for lavacli -echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list +echo "deb https://apt.lavasoftware.org/release stretch-backports main" >> /etc/apt/sources.list DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -t stretch-backports lavacli |