diff options
| -rw-r--r-- | jjb/ci-AGL-verify/ci-platform-jjb.yaml | 5 | ||||
| -rw-r--r-- | jjb/common/include-agl-auto-conf.sh | 49 | ||||
| -rw-r--r-- | jjb/common/include-agl-bitbake-image.sh | 3 | ||||
| -rw-r--r-- | jjb/common/include-agl-local-conf-DISTROFEATURES-AGLCI.sh | 2 | ||||
| -rw-r--r-- | jjb/common/include-agl-setup-and-bitbake-ivi-image.sh | 69 |
5 files changed, 74 insertions, 54 deletions
diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml index 6f796ecb..59154c4d 100644 --- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml +++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml @@ -14,8 +14,6 @@ - meta-agl-devel - meta-agl-extra - AGL-repo - - meta-renesas - - meta-renesas-rcar-gen3 jobs: - ci-platform-{project}-verify # - ci-platform-{project}-verify-CIB-start #unused @@ -311,13 +309,12 @@ - ../common/include-agl-source-aglsetup.sh - ../common/include-agl-auto-conf.sh - ../common/include-agl-limit-parallelism.sh - - ../common/include-agl-local-conf-DISTROFEATURES-AGLCI.sh - ../common/include-agl-cat-auto-conf.sh - - include-release-eel-fix-task-depends.sh - ../common/include-agl-bitbake-image.sh - ../common/include-agl-bitbake-sdk-x64only.sh - ../common/include-agl-run-test-prepare.sh - ../common/include-agl-run-test-rsync-changeid.sh + - ../common/include-agl-setup-and-bitbake-ivi-image.sh - conditional-step: condition-kind: always steps: diff --git a/jjb/common/include-agl-auto-conf.sh b/jjb/common/include-agl-auto-conf.sh index 20f5d9fb..3f806d84 100644 --- a/jjb/common/include-agl-auto-conf.sh +++ b/jjb/common/include-agl-auto-conf.sh @@ -5,52 +5,3 @@ ## auto.conf inclusion of mirrors ################################################################################ -export DLHOST="http://download.automotivelinux.org/" -if test x"" = x"${GERRIT_BRANCH}"; then - export DISTROBRANCH="master" -else - export DISTROBRANCH="${GERRIT_BRANCH}" -fi -cat << EOF >> conf/auto.conf -PREMIRRORS = "\ -git://.*/.* ${DLHOST}/AGL/mirror/ \n \ -ftp://.*/.* ${DLHOST}/AGL/mirror/ \n \ -http://.*/.* ${DLHOST}/AGL/mirror/ \n \ -https://.*/.* ${DLHOST}/AGL/mirror/ \n \ - " - -EOF - -if test x"YES" != x"${DISABLE_SSTATE_MIRROR}" ; then - -cat << EOF >> conf/auto.conf -SSTATE_MIRRORS = " \ - file://.* ${DLHOST}/sstate-mirror/${DISTROBRANCH}/\${DEFAULTTUNE}/PATH \n \ - " -# -#file://.* file:///opt/AGL/sstate-mirror/\${MACHINE}/PATH \n -# - -IMAGE_FSTYPES_remove = "ext3" -SSTATE_DIR = "\${TOPDIR}/sstate-cache/\${MACHINE}/" - -INHERIT += "packagefeed-stability" -INHERIT += "buildhistory" -EOF - -fi - -# PRSERV and HASHSERV for CI -# but only starting with dunfell / master -> soon jellyfish -if test x"master" = x"${DISTROBRANCH}" -o x"jellyfish" = x"${DISTROBRANCH}" ; then - -export PRHASHSERV="10.30.72.18" -cat << EOF >> conf/auto.conf -# HASHSERVE -BB_HASHSERVE = "${PRHASHSERV}:8686" -BB_SIGNATURE_HANDLER = "OEEquivHash" - -PRSERV_HOST = "${PRHASHSERV}:8585" -EOF - -fi diff --git a/jjb/common/include-agl-bitbake-image.sh b/jjb/common/include-agl-bitbake-image.sh index 690df237..3ac2f3bd 100644 --- a/jjb/common/include-agl-bitbake-image.sh +++ b/jjb/common/include-agl-bitbake-image.sh @@ -9,6 +9,9 @@ #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 ) diff --git a/jjb/common/include-agl-local-conf-DISTROFEATURES-AGLCI.sh b/jjb/common/include-agl-local-conf-DISTROFEATURES-AGLCI.sh index 0dc32c86..f502f377 100644 --- a/jjb/common/include-agl-local-conf-DISTROFEATURES-AGLCI.sh +++ b/jjb/common/include-agl-local-conf-DISTROFEATURES-AGLCI.sh @@ -1,3 +1,3 @@ # This is the big switch for in-CI builds -echo 'DISTRO_FEATURES_append = " AGLCI"' >> conf/local.conf +#echo 'DISTRO_FEATURES_append = " AGLCI"' >> conf/local.conf diff --git a/jjb/common/include-agl-setup-and-bitbake-ivi-image.sh b/jjb/common/include-agl-setup-and-bitbake-ivi-image.sh new file mode 100644 index 00000000..5707b9c6 --- /dev/null +++ b/jjb/common/include-agl-setup-and-bitbake-ivi-image.sh @@ -0,0 +1,69 @@ +# (c) 2016 Jan-Simon Moeller dl9pf(at)gmx.de +# License GPLv2 + +################################################################################ +## bitbake the image +################################################################################ + +#if ! test x"${GERRIT_BRANCH}" = x"dab" ; then +#bitbake wic-tools +#fi + +echo "#### $MYPROJECT ###" + +if test x"meta-agl-devel" = x"$MYPROJECT" ; then + +if test x"qemux86-64" = x"$MACHINE" ; then + + +TARGETIMAGE="agl-image-boot-basesystem" +TARGETFEATURES="agl-basesystem agl-ci" + +echo "#### DO CI FOR $MYPROJECT , $TARGETFEATURES and $TARGETIMAGE" + +pushd $REPODIR + +SETUP_OPTS="--topic change-${GERRIT_CHANGE_NUMBER}-${GERRIT_PATCHSET_NUMBER}" + +# source the env +source meta-agl/scripts/aglsetup.sh ${SETUP_OPTS} -m ${MACHINE} -b output-meta-agl-devel -f ${TARGETFEATURES} + +# link the shared downloads and sstate-cache +ln -sf ../../downloads +ln -sf ../../sstate-cache + +echo "" >> conf/local.conf +echo "### ADDED BY AUTOBUILDER ###" >> conf/local.conf +echo "" >> conf/local.conf + +# save some pre-build env needed to uniquely identify the source +MANIFEST_R=repo-manifest-r.txt +repo manifest -r > ${MANIFEST_R} +sha1sum ${MANIFEST_R} | awk '{print $1}' > ${MANIFEST_R}.sha1 + +cat <<EOF > pre-build-env.txt +TARGETBRANCH=${TARGETBRANCH} +TARGETIMAGE=${TARGETIMAGE} +TARGETFEATURES=${TARGETFEATURES} +TARGETMACHINE=${TARGETMACHINE} +TARGETPROJECT=${TARGETPROJECT} +MACHINE=${MACHINE} +GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER} +GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER} +EOF + + +# 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 ) + + + +du -hs tmp/deploy/* + +popd + +fi +# / qemux86-64 + +fi +# / meta-agl-devel
\ No newline at end of file |