diff options
Diffstat (limited to 'jjb/common')
31 files changed, 47 insertions, 546 deletions
diff --git a/jjb/common/include-agl-app-run-test-short.sh b/jjb/common/OLD/include-agl-app-run-test-short.sh index e1bd6998..e21e68c1 100644 --- a/jjb/common/include-agl-app-run-test-short.sh +++ b/jjb/common/OLD/include-agl-app-run-test-short.sh @@ -6,7 +6,8 @@ ## Run SHORT CI test ################################################################################ -#set -x +# +set -x cd $REPODIR @@ -16,7 +17,7 @@ BUILD_VERSION="AGL-app-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER" echo "# LAVA lab target: ${LAVA_LAB} #" # releng-scripts depends on jinja2 >= 2.9 echo "## Check version of python-jinja2: " -pip show jinja2 +pip3 show jinja2 CREATE_ARGS="" case $TARGETARCH in arm) diff --git a/jjb/common/include-agl-bitbake-image-fake.sh b/jjb/common/OLD/include-agl-bitbake-image-fake.sh index 7cd81c12..7cd81c12 100644 --- a/jjb/common/include-agl-bitbake-image-fake.sh +++ b/jjb/common/OLD/include-agl-bitbake-image-fake.sh diff --git a/jjb/common/include-agl-local-conf-isafw.sh b/jjb/common/OLD/include-agl-local-conf-isafw.sh index 5da94cd6..5da94cd6 100644 --- a/jjb/common/include-agl-local-conf-isafw.sh +++ b/jjb/common/OLD/include-agl-local-conf-isafw.sh diff --git a/jjb/common/include-agl-local-conf-rpi3-imagetype.sh b/jjb/common/OLD/include-agl-local-conf-rpi3-imagetype.sh index 3d4e3cb5..3d4e3cb5 100644 --- a/jjb/common/include-agl-local-conf-rpi3-imagetype.sh +++ b/jjb/common/OLD/include-agl-local-conf-rpi3-imagetype.sh diff --git a/jjb/common/include-agl-bitbake-image-nofail.sh b/jjb/common/include-agl-bitbake-image-nofail.sh index 8f6320c2..a215cbbf 100644 --- a/jjb/common/include-agl-bitbake-image-nofail.sh +++ b/jjb/common/include-agl-bitbake-image-nofail.sh @@ -5,10 +5,6 @@ ## bitbake the image ################################################################################ -#if ! test x"${GERRIT_BRANCH}" = x"dab" ; then -#bitbake wic-tools -#fi - # finally, build the agl-demo-platform (we retry to catch the tar-native bug) ( ( bitbake $TARGETIMAGE ) || ( echo '## Failed once, retry .. ##' ; sync ; sleep 2 ; bitbake -v -v $TARGETIMAGE ) ) || ( echo '## Failed again, bail out ...' ; exit 0 ) diff --git a/jjb/common/include-agl-bitbake-image.sh b/jjb/common/include-agl-bitbake-image.sh index dd65a6b6..3372f47f 100644 --- a/jjb/common/include-agl-bitbake-image.sh +++ b/jjb/common/include-agl-bitbake-image.sh @@ -5,16 +5,9 @@ ## bitbake the image ################################################################################ -#if ! test x"${GERRIT_BRANCH}" = x"dab" ; then -#bitbake wic-tools -#fi - cat conf/local.conf - # finally, build the agl-demo-platform (we retry to catch the tar-native bug) ( ( bitbake $TARGETIMAGE ) || ( echo '## Failed once, retry .. ##' ; sync ; sleep 2 ; bitbake -v -v $TARGETIMAGE ) ) || ( echo '## Failed again, bail out ...' ; exit 1 ) -#bitbake --dump-signature $TARGETIMAGE -#cp locked-sigs.inc tmp/deploy/images/ du -hs tmp/deploy/* diff --git a/jjb/common/include-agl-bitbake-sdk.sh b/jjb/common/include-agl-bitbake-sdk.sh index bf51beb3..237208cf 100644 --- a/jjb/common/include-agl-bitbake-sdk.sh +++ b/jjb/common/include-agl-bitbake-sdk.sh @@ -4,12 +4,8 @@ ################################################################################ ## bitbake the sdk ################################################################################ -#if ! test x"${GERRIT_BRANCH}" = x"dab" ; then -#bitbake wic-tools -#fi # finally, build the agl-demo-platform (we retry to catch the tar-native bug) -#( ( bitbake -c $TARGETSDK $TARGETIMAGE ) || ( echo '## Failed once, retry .. ##' ; sync ; sleep 2 ; bitbake -c $TARGETSDK $TARGETIMAGE ) ) || ( echo '## Failed again, bail out ... ##' ; exit 1 ) ( ( bitbake $TARGETSDKIMAGE ) || ( echo '## Failed once, retry .. ##' ; sync ; sleep 2 ; bitbake $TARGETSDKIMAGE ) ) || ( echo '## Failed again, bail out ... ##' ; exit 1 ) du -hs tmp/deploy/* diff --git a/jjb/common/include-agl-header.sh b/jjb/common/include-agl-header.sh index 5f1a6667..90ee0ce8 100644 --- a/jjb/common/include-agl-header.sh +++ b/jjb/common/include-agl-header.sh @@ -33,10 +33,10 @@ export TARGETFEATURESnogfx="agl-ci-change-features-nogfx agl-ci" export TARGETFEATURES="agl-ci-change-features agl-ci" export TARGETQA="" -export TARGETIMAGE="agl-demo-platform\${TARGETQA}" -export TARGETIMAGEnogfx="agl-image-ivi-crosssdk" +export TARGETIMAGE="agl-ivi-demo-qt" +export TARGETIMAGEnogfx="agl-ivi-demo-qt" -export TARGETSDKIMAGE="agl-demo-platform-crosssdk" +export TARGETSDKIMAGE="agl-ivi-demo-qt-crosssdk" # apply GERRIT_* @@ -132,32 +132,14 @@ if test -n "${BUILDONLY}" ; then fi fi -# The exceptions -if $NOGFX; then - export TARGETIMAGE=${TARGETIMAGEnogfx} - export TARGETFEATURES="${TARGETFEATURESnogfx}" -fi -# porter-nogfx means no graphic drivers -if test x"porter-nogfx" = x"$MACHINE"; then - export TARGETIMAGE=${TARGETIMAGEnogfx} - export TARGETFEATURES="${TARGETFEATURESnogfx}" - export TARGETMACHINE="porter" - export TARGETSDKIMAGE="agl-image-ivi-crosssdk" -fi # m3ulcb-nogfx means no graphic drivers if test x"m3ulcb-nogfx" = x"$MACHINE"; then - export TARGETIMAGE=${TARGETIMAGEnogfx} export TARGETFEATURES="${TARGETFEATURESnogfx}" export TARGETMACHINE="m3ulcb" - export TARGETSDKIMAGE="agl-image-ivi-crosssdk" fi set -x # h3ulcb-nogfx means no graphic drivers if test x"h3ulcb-nogfx" = x"$MACHINE"; then - if [ "${TARGETBRANCH}" = 'jellyfish' -o "${TARGETBRANCH}" = 'halibut' ];then - export TARGETIMAGE=${TARGETIMAGEnogfx} - export TARGETSDKIMAGE="agl-image-ivi-crosssdk" - fi export TARGETFEATURES="${TARGETFEATURESnogfx} agl-refhw-h3" export TARGETMACHINE="h3ulcb" fi @@ -165,9 +147,6 @@ set +x if test x"raspberrypi4" = x"${MACHINE}" ; then export TARGETMACHINE="raspberrypi4-64" - if test x"halibut" = x"${TARGETBRANCH}" ; then - export TARGETMACHINE="raspberrypi4" - fi fi #if $DEBUG; then @@ -183,18 +162,3 @@ if test ! -f ~/.gitconfig ; then git config --global user.email "jenkins-dontreply@build.automotivelinux.org" git config --global user.name "jenkins-dontreply@build.automotivelinux.org" fi - - - -##### needlefish integration -if test x"lamprey" != x"${TARGETBRANCH}" ; then - if test x"bbe" = x"${TARGETMACHINE}" ; then - echo "Target only works for TELEMATICS PROFILE. Select this:" - echo "TARGETFEATURES=\"${TARGETFEATURESnogfx}\"" - TARGETFEATURES="${TARGETFEATURESnogfx}" - echo "TARGETIMAGE=\"agl-telematics-demo-platform\"" - echo "TARGETSDKIMAGE=\"agl-telematics-demo-platform\"" - TARGETIMAGE="agl-telematics-demo-platform" - TARGETSDKIMAGE="agl-telematics-demo-platform" - fi -fi diff --git a/jjb/common/include-agl-kci-publish-build-meta.sh b/jjb/common/include-agl-kci-publish-build-meta.sh index 1c586a45..5782c004 100644 --- a/jjb/common/include-agl-kci-publish-build-meta.sh +++ b/jjb/common/include-agl-kci-publish-build-meta.sh @@ -5,13 +5,15 @@ echo "#########################################" echo "\n\n\n" kci-publish() { - if [ -e tmp/deploy/images/${TARGETMACHINE}/build-info ] ; then - echo "DEBUG: load build-info" - # we need some variable from here - source tmp/deploy/images/${TARGETMACHINE}/build-info - fi +# if [ -e tmp/deploy/images/${TARGETMACHINE}/build-info ] ; then +# echo "DEBUG: load build-info" +# # we need some variable from here +# source tmp/deploy/images/${TARGETMACHINE}/build-info +# fi echo "DEBUG: GERRIT_PROJECT $GERRIT_PROJECT" +set + FSR="" # check GERRIT_PROJECT to find if we build an app or not if echo $GERRIT_PROJECT |grep -q apps ;then @@ -108,4 +110,4 @@ set -e return 0 } -kci-publish +#kci-publish diff --git a/jjb/common/include-agl-limit-parallelism.sh b/jjb/common/include-agl-limit-parallelism.sh index 05cbc2b2..3305856a 100644 --- a/jjb/common/include-agl-limit-parallelism.sh +++ b/jjb/common/include-agl-limit-parallelism.sh @@ -2,8 +2,8 @@ # Throttle threads to 6 cat << EOF >> conf/auto.conf -#BB_NUMBER_THREADS = "5" -#BB_NUMBER_PARSE_THREADS = "8" -#PARALLEL_MAKE = "-j5" +BB_NUMBER_THREADS = "6" +BB_NUMBER_PARSE_THREADS = "6" +PARALLEL_MAKE = "-j6" EOF diff --git a/jjb/common/include-agl-run-test-prepare.sh b/jjb/common/include-agl-run-test-prepare.sh index b57cdcd7..9bc736dc 100644 --- a/jjb/common/include-agl-run-test-prepare.sh +++ b/jjb/common/include-agl-run-test-prepare.sh @@ -16,7 +16,7 @@ else fi if [ -e releng-scripts/utils ]; then - export PATH=$PATH:$PWD/releng-scripts/utils + export PATH="/usr/bin:$PATH:$PWD/releng-scripts/utils" RELENG=$PWD/releng-scripts fi diff --git a/jjb/common/include-agl-run-test-rsync-changeid.sh b/jjb/common/include-agl-run-test-rsync-changeid.sh index 2568992f..8450e649 100644 --- a/jjb/common/include-agl-run-test-rsync-changeid.sh +++ b/jjb/common/include-agl-run-test-rsync-changeid.sh @@ -33,9 +33,11 @@ do echo "tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB}" echo "tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB#"$DEVICE_KERNEL"-}" - if [ -e tmp/deploy/images/${TARGETMACHINE}/build-info ] ; then - cp -avL tmp/deploy/images/${TARGETMACHINE}/build-info ${DEST}/ - fi +# if [ -e tmp/deploy/images/${TARGETMACHINE}/build-info ] ; then +# cp -avL tmp/deploy/images/${TARGETMACHINE}/build-info ${DEST}/ +# fi + +set # detect BUG SPEC-3751 F_NBDROOT="tmp/deploy/images/${TARGETMACHINE}/$DEVICE_NBDROOT" diff --git a/jjb/common/include-agl-run-test-short-flounder.sh b/jjb/common/include-agl-run-test-short-flounder.sh deleted file mode 100644 index fa949741..00000000 --- a/jjb/common/include-agl-run-test-short-flounder.sh +++ /dev/null @@ -1,34 +0,0 @@ -# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de -# License GPLv2 - -################################################################################ -## Run SHORT CI test -################################################################################ - -#set -x - -cd $REPODIR - -echo "# LAVA lab target: ${LAVA_LAB} #" -# releng-scripts depends on jinja2 >= 2.9 -echo "## Check version of python-jinja2: " -pip show jinja2 -CREATE_ARGS="" -CREATE_ARGS+="--machine ${releng_device} " -CREATE_ARGS+="--build-type release " -#[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH " -#[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION " -CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ " -BUILD_VERSION="AGL-gerrit-$RELEASE_BRANCH-$RELEASE_VERSION" -[[ -e output/repo-manifest-r.txt.sha1 ]] && BUILD_VERSION+="-$(cat output/repo-manifest-r.txt.sha1)" -CREATE_ARGS+="--name AGL-gerrit-$RELEASE_BRANCH-$RELEASE_VERSION " -CREATE_ARGS+="--build-version $BUILD_VERSION " -CREATE_ARGS+="--callback-from ${LAVA_LAB} " -$RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml - -if [ $? != 0 ]; then - echo "ERROR: Machine ${releng_device}: LAVA job creation failed." - exit 0 -else - cat testjob.yaml -fi diff --git a/jjb/common/include-agl-run-test-short-guppy.sh b/jjb/common/include-agl-run-test-short-guppy.sh deleted file mode 100644 index 91f0a57f..00000000 --- a/jjb/common/include-agl-run-test-short-guppy.sh +++ /dev/null @@ -1,45 +0,0 @@ -# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de -# License GPLv2 - -################################################################################ -## Run SHORT CI test -################################################################################ - -#set -x - -UPLOAD_URL_BASE=http://download.automotivelinux.org/AGL/upload/ci -UPLOAD_URL=${UPLOAD_URL_BASE}/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE} - -cd $REPODIR - -wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info" -if [ -e build-info ]; then - cat build-info - source build-info -fi - -echo "# LAVA lab target: ${LAVA_LAB} #" -# releng-scripts depends on jinja2 >= 2.9 -echo "## Check version of python-jinja2: " -pip show jinja2 -CREATE_ARGS="" -CREATE_ARGS+="--machine ${releng_device} " -CREATE_ARGS+="--build-type release " -#[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH " -#[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION " -CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ " -CREATE_ARGS+="--name AGL-gerrit-$DIST_BB_AGL_BRANCH-$DIST_BB_AGLVERSION " -[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION " -[[ ! -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 " -[[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION " -CREATE_ARGS+="--callback-from ${LAVA_LAB} " -$RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml - -if [ $? != 0 ]; then - echo "ERROR: Machine ${releng_device}: LAVA job creation failed." - exit 0 -else - cat testjob.yaml -fi diff --git a/jjb/common/include-agl-run-test-short-halibut.sh b/jjb/common/include-agl-run-test-short-halibut.sh deleted file mode 100644 index 91f0a57f..00000000 --- a/jjb/common/include-agl-run-test-short-halibut.sh +++ /dev/null @@ -1,45 +0,0 @@ -# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de -# License GPLv2 - -################################################################################ -## Run SHORT CI test -################################################################################ - -#set -x - -UPLOAD_URL_BASE=http://download.automotivelinux.org/AGL/upload/ci -UPLOAD_URL=${UPLOAD_URL_BASE}/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE} - -cd $REPODIR - -wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info" -if [ -e build-info ]; then - cat build-info - source build-info -fi - -echo "# LAVA lab target: ${LAVA_LAB} #" -# releng-scripts depends on jinja2 >= 2.9 -echo "## Check version of python-jinja2: " -pip show jinja2 -CREATE_ARGS="" -CREATE_ARGS+="--machine ${releng_device} " -CREATE_ARGS+="--build-type release " -#[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH " -#[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION " -CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ " -CREATE_ARGS+="--name AGL-gerrit-$DIST_BB_AGL_BRANCH-$DIST_BB_AGLVERSION " -[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION " -[[ ! -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 " -[[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION " -CREATE_ARGS+="--callback-from ${LAVA_LAB} " -$RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml - -if [ $? != 0 ]; then - echo "ERROR: Machine ${releng_device}: LAVA job creation failed." - exit 0 -else - cat testjob.yaml -fi diff --git a/jjb/common/include-agl-run-test-short-icefish.sh b/jjb/common/include-agl-run-test-short-icefish.sh deleted file mode 100644 index 91f0a57f..00000000 --- a/jjb/common/include-agl-run-test-short-icefish.sh +++ /dev/null @@ -1,45 +0,0 @@ -# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de -# License GPLv2 - -################################################################################ -## Run SHORT CI test -################################################################################ - -#set -x - -UPLOAD_URL_BASE=http://download.automotivelinux.org/AGL/upload/ci -UPLOAD_URL=${UPLOAD_URL_BASE}/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE} - -cd $REPODIR - -wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info" -if [ -e build-info ]; then - cat build-info - source build-info -fi - -echo "# LAVA lab target: ${LAVA_LAB} #" -# releng-scripts depends on jinja2 >= 2.9 -echo "## Check version of python-jinja2: " -pip show jinja2 -CREATE_ARGS="" -CREATE_ARGS+="--machine ${releng_device} " -CREATE_ARGS+="--build-type release " -#[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH " -#[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION " -CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ " -CREATE_ARGS+="--name AGL-gerrit-$DIST_BB_AGL_BRANCH-$DIST_BB_AGLVERSION " -[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION " -[[ ! -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 " -[[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION " -CREATE_ARGS+="--callback-from ${LAVA_LAB} " -$RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml - -if [ $? != 0 ]; then - echo "ERROR: Machine ${releng_device}: LAVA job creation failed." - exit 0 -else - cat testjob.yaml -fi diff --git a/jjb/common/include-agl-run-test-short-koi.sh b/jjb/common/include-agl-run-test-short-koi.sh deleted file mode 100644 index 91f0a57f..00000000 --- a/jjb/common/include-agl-run-test-short-koi.sh +++ /dev/null @@ -1,45 +0,0 @@ -# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de -# License GPLv2 - -################################################################################ -## Run SHORT CI test -################################################################################ - -#set -x - -UPLOAD_URL_BASE=http://download.automotivelinux.org/AGL/upload/ci -UPLOAD_URL=${UPLOAD_URL_BASE}/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE} - -cd $REPODIR - -wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info" -if [ -e build-info ]; then - cat build-info - source build-info -fi - -echo "# LAVA lab target: ${LAVA_LAB} #" -# releng-scripts depends on jinja2 >= 2.9 -echo "## Check version of python-jinja2: " -pip show jinja2 -CREATE_ARGS="" -CREATE_ARGS+="--machine ${releng_device} " -CREATE_ARGS+="--build-type release " -#[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH " -#[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION " -CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ " -CREATE_ARGS+="--name AGL-gerrit-$DIST_BB_AGL_BRANCH-$DIST_BB_AGLVERSION " -[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION " -[[ ! -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 " -[[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION " -CREATE_ARGS+="--callback-from ${LAVA_LAB} " -$RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml - -if [ $? != 0 ]; then - echo "ERROR: Machine ${releng_device}: LAVA job creation failed." - exit 0 -else - cat testjob.yaml -fi diff --git a/jjb/common/include-agl-run-test-short-lamprey.sh b/jjb/common/include-agl-run-test-short-lamprey.sh deleted file mode 100644 index 91f0a57f..00000000 --- a/jjb/common/include-agl-run-test-short-lamprey.sh +++ /dev/null @@ -1,45 +0,0 @@ -# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de -# License GPLv2 - -################################################################################ -## Run SHORT CI test -################################################################################ - -#set -x - -UPLOAD_URL_BASE=http://download.automotivelinux.org/AGL/upload/ci -UPLOAD_URL=${UPLOAD_URL_BASE}/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE} - -cd $REPODIR - -wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info" -if [ -e build-info ]; then - cat build-info - source build-info -fi - -echo "# LAVA lab target: ${LAVA_LAB} #" -# releng-scripts depends on jinja2 >= 2.9 -echo "## Check version of python-jinja2: " -pip show jinja2 -CREATE_ARGS="" -CREATE_ARGS+="--machine ${releng_device} " -CREATE_ARGS+="--build-type release " -#[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH " -#[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION " -CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ " -CREATE_ARGS+="--name AGL-gerrit-$DIST_BB_AGL_BRANCH-$DIST_BB_AGLVERSION " -[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION " -[[ ! -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 " -[[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION " -CREATE_ARGS+="--callback-from ${LAVA_LAB} " -$RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml - -if [ $? != 0 ]; then - echo "ERROR: Machine ${releng_device}: LAVA job creation failed." - exit 0 -else - cat testjob.yaml -fi diff --git a/jjb/common/include-agl-run-test-short-marlin.sh b/jjb/common/include-agl-run-test-short-marlin.sh deleted file mode 100644 index 91f0a57f..00000000 --- a/jjb/common/include-agl-run-test-short-marlin.sh +++ /dev/null @@ -1,45 +0,0 @@ -# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de -# License GPLv2 - -################################################################################ -## Run SHORT CI test -################################################################################ - -#set -x - -UPLOAD_URL_BASE=http://download.automotivelinux.org/AGL/upload/ci -UPLOAD_URL=${UPLOAD_URL_BASE}/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE} - -cd $REPODIR - -wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info" -if [ -e build-info ]; then - cat build-info - source build-info -fi - -echo "# LAVA lab target: ${LAVA_LAB} #" -# releng-scripts depends on jinja2 >= 2.9 -echo "## Check version of python-jinja2: " -pip show jinja2 -CREATE_ARGS="" -CREATE_ARGS+="--machine ${releng_device} " -CREATE_ARGS+="--build-type release " -#[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH " -#[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION " -CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ " -CREATE_ARGS+="--name AGL-gerrit-$DIST_BB_AGL_BRANCH-$DIST_BB_AGLVERSION " -[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION " -[[ ! -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 " -[[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION " -CREATE_ARGS+="--callback-from ${LAVA_LAB} " -$RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml - -if [ $? != 0 ]; then - echo "ERROR: Machine ${releng_device}: LAVA job creation failed." - exit 0 -else - cat testjob.yaml -fi diff --git a/jjb/common/include-agl-run-test-short-needlefish.sh b/jjb/common/include-agl-run-test-short-needlefish.sh deleted file mode 100644 index 91f0a57f..00000000 --- a/jjb/common/include-agl-run-test-short-needlefish.sh +++ /dev/null @@ -1,45 +0,0 @@ -# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de -# License GPLv2 - -################################################################################ -## Run SHORT CI test -################################################################################ - -#set -x - -UPLOAD_URL_BASE=http://download.automotivelinux.org/AGL/upload/ci -UPLOAD_URL=${UPLOAD_URL_BASE}/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE} - -cd $REPODIR - -wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info" -if [ -e build-info ]; then - cat build-info - source build-info -fi - -echo "# LAVA lab target: ${LAVA_LAB} #" -# releng-scripts depends on jinja2 >= 2.9 -echo "## Check version of python-jinja2: " -pip show jinja2 -CREATE_ARGS="" -CREATE_ARGS+="--machine ${releng_device} " -CREATE_ARGS+="--build-type release " -#[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH " -#[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION " -CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ " -CREATE_ARGS+="--name AGL-gerrit-$DIST_BB_AGL_BRANCH-$DIST_BB_AGLVERSION " -[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION " -[[ ! -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 " -[[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION " -CREATE_ARGS+="--callback-from ${LAVA_LAB} " -$RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml - -if [ $? != 0 ]; then - echo "ERROR: Machine ${releng_device}: LAVA job creation failed." - exit 0 -else - cat testjob.yaml -fi diff --git a/jjb/common/include-agl-run-test-short-octopus.sh b/jjb/common/include-agl-run-test-short-octopus.sh deleted file mode 100644 index 91f0a57f..00000000 --- a/jjb/common/include-agl-run-test-short-octopus.sh +++ /dev/null @@ -1,45 +0,0 @@ -# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de -# License GPLv2 - -################################################################################ -## Run SHORT CI test -################################################################################ - -#set -x - -UPLOAD_URL_BASE=http://download.automotivelinux.org/AGL/upload/ci -UPLOAD_URL=${UPLOAD_URL_BASE}/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE} - -cd $REPODIR - -wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info" -if [ -e build-info ]; then - cat build-info - source build-info -fi - -echo "# LAVA lab target: ${LAVA_LAB} #" -# releng-scripts depends on jinja2 >= 2.9 -echo "## Check version of python-jinja2: " -pip show jinja2 -CREATE_ARGS="" -CREATE_ARGS+="--machine ${releng_device} " -CREATE_ARGS+="--build-type release " -#[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH " -#[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION " -CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ " -CREATE_ARGS+="--name AGL-gerrit-$DIST_BB_AGL_BRANCH-$DIST_BB_AGLVERSION " -[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION " -[[ ! -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 " -[[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION " -CREATE_ARGS+="--callback-from ${LAVA_LAB} " -$RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml - -if [ $? != 0 ]; then - echo "ERROR: Machine ${releng_device}: LAVA job creation failed." - exit 0 -else - cat testjob.yaml -fi diff --git a/jjb/common/include-agl-run-test-short-pike.sh b/jjb/common/include-agl-run-test-short-pike.sh deleted file mode 100644 index 91f0a57f..00000000 --- a/jjb/common/include-agl-run-test-short-pike.sh +++ /dev/null @@ -1,45 +0,0 @@ -# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de -# License GPLv2 - -################################################################################ -## Run SHORT CI test -################################################################################ - -#set -x - -UPLOAD_URL_BASE=http://download.automotivelinux.org/AGL/upload/ci -UPLOAD_URL=${UPLOAD_URL_BASE}/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE} - -cd $REPODIR - -wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info" -if [ -e build-info ]; then - cat build-info - source build-info -fi - -echo "# LAVA lab target: ${LAVA_LAB} #" -# releng-scripts depends on jinja2 >= 2.9 -echo "## Check version of python-jinja2: " -pip show jinja2 -CREATE_ARGS="" -CREATE_ARGS+="--machine ${releng_device} " -CREATE_ARGS+="--build-type release " -#[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH " -#[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION " -CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ " -CREATE_ARGS+="--name AGL-gerrit-$DIST_BB_AGL_BRANCH-$DIST_BB_AGLVERSION " -[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION " -[[ ! -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 " -[[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION " -CREATE_ARGS+="--callback-from ${LAVA_LAB} " -$RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml - -if [ $? != 0 ]; then - echo "ERROR: Machine ${releng_device}: LAVA job creation failed." - exit 0 -else - cat testjob.yaml -fi diff --git a/jjb/common/include-agl-run-test-short-release.sh b/jjb/common/include-agl-run-test-short-release.sh index 7b13784e..5c5a9c0d 100644 --- a/jjb/common/include-agl-run-test-short-release.sh +++ b/jjb/common/include-agl-run-test-short-release.sh @@ -15,7 +15,8 @@ BUILD_VERSION="AGL-gerrit-$RELEASE_BRANCH-$RELEASE_VERSION" echo "# LAVA lab target: ${LAVA_LAB} #" # releng-scripts depends on jinja2 >= 2.9 echo "## Check version of python-jinja2: " -pip show jinja2 +pip3 show jinja2 + CREATE_ARGS="" CREATE_ARGS+="--machine ${releng_device} " CREATE_ARGS+="--build-type release " diff --git a/jjb/common/include-agl-run-test-short-jellyfish.sh b/jjb/common/include-agl-run-test-short-releaseit.sh index 91f0a57f..1c494eca 100644 --- a/jjb/common/include-agl-run-test-short-jellyfish.sh +++ b/jjb/common/include-agl-run-test-short-releaseit.sh @@ -12,16 +12,19 @@ UPLOAD_URL=${UPLOAD_URL_BASE}/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/de cd $REPODIR -wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info" -if [ -e build-info ]; then - cat build-info - source build-info -fi +#wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info" +#if [ -e build-info ]; then +# cat build-info +# source build-info +#fi + +set echo "# LAVA lab target: ${LAVA_LAB} #" # releng-scripts depends on jinja2 >= 2.9 echo "## Check version of python-jinja2: " -pip show jinja2 +pip3 show jinja2 + CREATE_ARGS="" CREATE_ARGS+="--machine ${releng_device} " CREATE_ARGS+="--build-type release " diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh index 0e16e055..3fafcae6 100644 --- a/jjb/common/include-agl-run-test-short.sh +++ b/jjb/common/include-agl-run-test-short.sh @@ -12,11 +12,11 @@ UPLOAD_URL=${UPLOAD_URL_BASE}/${GERRIT_CHANGE_NUMBER}/${GERRIT_PATCHSET_NUMBER}/ cd $REPODIR -wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info" -if [ -e build-info ]; then - cat build-info - source build-info -fi +#wget -q ${UPLOAD_URL}/build-info || echo "ERROR: fail to download ${UPLOAD_URL}/build-info" +#if [ -e build-info ]; then +# cat build-info +# source build-info +#fi BUILD_VERSION="" if [[ ! -z $DIST_BUILD_TOPIC ]]; then @@ -28,7 +28,8 @@ fi echo "# LAVA lab target: ${LAVA_LAB} #" # releng-scripts depends on jinja2 >= 2.9 echo "## Check version of python-jinja2: " -pip show jinja2 +pip3 show jinja2 + CREATE_ARGS="" CREATE_ARGS+="--machine ${releng_device} " CREATE_ARGS+="--build-type ci " diff --git a/jjb/common/include-agl-send-email-report.sh b/jjb/common/include-agl-send-email-report.sh index f94a0c07..a9d10c2f 100644 --- a/jjb/common/include-agl-send-email-report.sh +++ b/jjb/common/include-agl-send-email-report.sh @@ -14,7 +14,7 @@ set | grep MACH send_email_report() { -wget -q ${UPLOAD_URL}/build-info || echo "ERROR: send_email_report: failed to get build-info" +#wget -q ${UPLOAD_URL}/build-info || echo "ERROR: send_email_report: failed to get build-info" if [ ! -s build-info ]; then return 0 @@ -37,4 +37,4 @@ if [ -n "$KCI_EMAIL_AUTH_TOKEN" ]; then fi } -send_email_report +#send_email_report diff --git a/jjb/common/include-agl-set-compositor-image.sh b/jjb/common/include-agl-set-compositor-image.sh index 4419e4ac..2ecae44e 100644 --- a/jjb/common/include-agl-set-compositor-image.sh +++ b/jjb/common/include-agl-set-compositor-image.sh @@ -9,13 +9,10 @@ set -e ## Header ################################################################################ -# only run on master, jellyfish and icefish -( echo "master marlin jellyfish icefish koi lamprey" | grep -q $TARGETBRANCH ) || exit 0 - # Use the agl-compositor export TARGETFEATURES="agl-demo agl-devel agl-netboot" export TARGETQA="" -export TARGETIMAGE="agl-demo-platform" +export TARGETIMAGE="agl-ivi-demo-platform" eval TARGETIMAGE="$TARGETIMAGE" eval TARGETIMAGEnogfx="$TARGETIMAGE" diff --git a/jjb/common/include-agl-set-flutter-demo-image.sh b/jjb/common/include-agl-set-flutter-demo-image.sh index c20372de..7b97a081 100644 --- a/jjb/common/include-agl-set-flutter-demo-image.sh +++ b/jjb/common/include-agl-set-flutter-demo-image.sh @@ -9,12 +9,9 @@ set -e ## Header ################################################################################ -# only run on master, jellyfish and icefish -! ( echo "marlin jellyfish lamprey koi" | grep -q $TARGETBRANCH ) || exit 0 - export TARGETFEATURES="agl-demo agl-devel agl-ci" export TARGETQA="" -export TARGETIMAGE="agl-ivi-demo-platform-flutter" +export TARGETIMAGE="agl-ivi-demo-flutter" eval TARGETIMAGE="$TARGETIMAGE" eval TARGETIMAGEnogfx="$TARGETIMAGE" diff --git a/jjb/common/include-agl-set-html5-image.sh b/jjb/common/include-agl-set-html5-image.sh index 80b95231..d33fb936 100644 --- a/jjb/common/include-agl-set-html5-image.sh +++ b/jjb/common/include-agl-set-html5-image.sh @@ -9,12 +9,9 @@ set -e ## Header ################################################################################ -# only run on master, jellyfish and icefish -#( echo "marlin jellyfish icefish koi lamprey" | grep -q $TARGETBRANCH ) || exit 0 - export TARGETFEATURES="agl-demo agl-devel agl-ci" export TARGETQA="" -export TARGETIMAGE="agl-demo-platform-html5" +export TARGETIMAGE="agl-ivi-demo-html5" eval TARGETIMAGE="$TARGETIMAGE" eval TARGETIMAGEnogfx="$TARGETIMAGE" diff --git a/jjb/common/include-agl-set-iceg-lxc-image.sh b/jjb/common/include-agl-set-iceg-lxc-image.sh index b7de3a97..33b48394 100644 --- a/jjb/common/include-agl-set-iceg-lxc-image.sh +++ b/jjb/common/include-agl-set-iceg-lxc-image.sh @@ -9,9 +9,6 @@ set -e ## Header ################################################################################ -# only run on master, jellyfish and icefish -! ( echo "marlin jellyfish icefish koi lamprey" | grep -q $TARGETBRANCH ) || exit 0 - export TARGETFEATURES="agl-ic-container agl-devel agl-ci" export TARGETQA="" export TARGETIMAGE="agl-cluster-demo-lxc-host" diff --git a/jjb/common/include-apps-header.sh b/jjb/common/include-apps-header.sh index b9ae1bd6..2ba23e76 100644 --- a/jjb/common/include-apps-header.sh +++ b/jjb/common/include-apps-header.sh @@ -12,8 +12,6 @@ set -e # VARIABLES OPTIND=1 -#export DLHOST="http://download.automotivelinux.org/" -# DLHOST in auto.conf export NOGFX=false export VERBOSE=false export DEBUG=false @@ -108,12 +106,7 @@ case "$TARGETARCH" in ;; x86-64) export TARGETSDKARCH="corei7-64" - # starting with master, we use qemu for the SDK. - if test x"master" = x"$AGLBRANCH" -o x"jellyfish" = x"${AGLBRANCH}" -o x"marlin" = x"${AGLBRANCH}" -o x"lamprey" = x"${AGLBRANCH}" -o x"koi" = x"${AGLBRANCH}" ; then - export TARGETSDKMACHINE="qemux86-64" - else - export TARGETSDKMACHINE="intel-corei7-64" - fi + export TARGETSDKMACHINE="qemux86-64" ;; aarch64) export TARGETSDKARCH="aarch64" |