diff options
| -rw-r--r-- | jjb/ci-AGL-verify/ci-platform-jjb.yaml | 36 | ||||
| -rw-r--r-- | jjb/ci-apps-verify/app-projects.yaml.inc | 96 | ||||
| -rw-r--r-- | jjb/common/include-agl-bitbake-image.sh | 4 | ||||
| -rw-r--r-- | jjb/common/include-agl-run-ycl-ci.sh | 3 | ||||
| -rw-r--r-- | jjb/common/include-agl-setup-and-bitbake-ivi-image.sh | 63 | ||||
| -rw-r--r-- | jjb/common/include-agl-source-aglsetup.sh | 7 | ||||
| -rw-r--r-- | packer/provision/agl_dependencies.sh | 61 |
7 files changed, 38 insertions, 232 deletions
diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml index 5d4f4df0..bc1f2f66 100644 --- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml +++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml @@ -2,7 +2,7 @@ - project: name: ci-platform-AGL machine: - - bbe + #- bbe - h3ulcb-nogfx - qemux86-64 - qemuarm @@ -28,9 +28,9 @@ # - ci-platform-{project}-verify-CIB-start #unused - ci-platform-{project}-verify-CIB-{machine} - ci-platform-{project}-verify-YCL-qemux86-64 - - ci-platform-{project}-verify-CIB-html5-qemux86-64 + #- ci-platform-{project}-verify-CIB-html5-qemux86-64 - ci-platform-{project}-verify-CIB-flutter-qemux86-64 - - ci-platform-{project}-verify-CIB-ic-multicontainer-qemux86-64 + #- ci-platform-{project}-verify-CIB-ic-multicontainer-qemux86-64 - ci-platform-{project}-verify-CIB-finish-success - ci-platform-{project}-verify-failure # - ci-platform-{project}-verify-CIBT-start #unused @@ -119,10 +119,10 @@ name: CIB-{project}-devboards condition: SUCCESSFUL projects: - - name: 'ci-platform-{project}-verify-CIB-bbe' - current-parameters: true - abort-all-job: false - kill-phase-on: NEVER + #- name: 'ci-platform-{project}-verify-CIB-bbe' + # current-parameters: true + # abort-all-job: false + # kill-phase-on: NEVER - name: 'ci-platform-{project}-verify-CIB-qemuarm' current-parameters: true #abort-all-job: true @@ -141,12 +141,12 @@ - name: 'ci-platform-{project}-verify-CIB-flutter-qemux86-64' current-parameters: true kill-phase-on: FAILURE - - name: 'ci-platform-{project}-verify-CIB-ic-multicontainer-qemux86-64' - current-parameters: true - kill-phase-on: FAILURE - - name: 'ci-platform-{project}-verify-CIB-html5-qemux86-64' - current-parameters: true - kill-phase-on: FAILURE + #- name: 'ci-platform-{project}-verify-CIB-ic-multicontainer-qemux86-64' + # current-parameters: true + # kill-phase-on: FAILURE + #- name: 'ci-platform-{project}-verify-CIB-html5-qemux86-64' + # current-parameters: true + # kill-phase-on: FAILURE - multijob: name: CIB-{project}-finish-success condition: SUCCESSFUL @@ -175,10 +175,10 @@ name: CIBT-{project} condition: SUCCESSFUL projects: - - name: 'ci-platform-{project}-verify-CIBT-bbe' - current-parameters: true - #abort-all-job: true - kill-phase-on: NEVER + #- name: 'ci-platform-{project}-verify-CIBT-bbe' + # current-parameters: true + # #abort-all-job: true + # kill-phase-on: NEVER - name: 'ci-platform-{project}-verify-CIBT-qemux86-64' current-parameters: true #abort-all-job: true @@ -425,7 +425,7 @@ !include-raw-escape: - ../common/include-agl-header.sh - ../common/include-agl-repo.sh - #- ../common/include-agl-select.sh + - ../common/include-agl-select.sh #- ../common/include-agl-source-aglsetup.sh - ../common/include-agl-run-ycl-ci.sh diff --git a/jjb/ci-apps-verify/app-projects.yaml.inc b/jjb/ci-apps-verify/app-projects.yaml.inc index 9d7edbea..84ecae07 100644 --- a/jjb/ci-apps-verify/app-projects.yaml.inc +++ b/jjb/ci-apps-verify/app-projects.yaml.inc @@ -1,99 +1,3 @@ -- agl-cluster-demo-dashboard -- agl-cluster-demo-gauges -- agl-cluster-demo-receiver -- agl-qt-cluster-demo-receiver -- agl-service-audio-4a - agl-service-audiomixer -- agl-service-bluetooth -- agl-service-bluetooth-map -- agl-service-bluetooth-pbap -- agl-service-can-high-level-viwi -- agl-service-can-low-level -- agl-service-cloudproxy -- agl-service-data-persistence -- agl-service-geoclue -- agl-service-geofence -- agl-service-gps -- agl-service-gstreamer -- agl-service-harvester -- agl-service-helloworld -- agl-service-homescreen -- agl-service-homescreen-2017 - agl-service-hvac -- agl-service-identity-agent -- agl-service-iiodevices -- agl-service-inputmethod -- agl-service-mediaplayer -- agl-service-mediascanner -- agl-service-navigation -- agl-service-network -- agl-service-nfc -- agl-service-platform-info -- agl-service-poi - agl-service-radio -- agl-service-signal-composer -- agl-service-soundmanager -- agl-service-soundmanager-2017 -- agl-service-speech -- agl-service-steering-wheel -- 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 -- agl-service-wifi -- agl-service-windowmanager -- agl-service-windowmanager-2017 -- agl-service-xds-monitoring -- agl-telematics-demo-recorder -- alexa-viewer -- als-meter-demo -- app-afb-helpers-submodule -- app-afb-test -- app-controller-submodule -- app-templates -- aroundview -- camera-gstreamer -- chromium -- controls -- dashboard -- demo3-camera -- demo3-dashboard -- demo3-homescreen -- demo3-hvac -- demo3-launcher -- demo3-settings -- demo3-tachometer -- demo3-warehouse -- homescreen -- homescreen-demo-ci -- html5-dashboard -- html5-homescreen -- html5-hvac -- html5-launcher -- html5-mediaplayer -- html5-mixer -- html5-settings -- hvac -- launcher -- low-level-can-service -- mediaplayer -- messaging -- mixer -- navigation -- ondemandnavi -- onscreenapp -- phone -- poi-yelp -- radio -- restriction-screen -- settings -- settings-bluetooth -- settings-log-utils -- settings-wifi -- taskmanager -- tbtnavi -- videoplayer -- waltham-receiver diff --git a/jjb/common/include-agl-bitbake-image.sh b/jjb/common/include-agl-bitbake-image.sh index 40634445..dd65a6b6 100644 --- a/jjb/common/include-agl-bitbake-image.sh +++ b/jjb/common/include-agl-bitbake-image.sh @@ -15,6 +15,6 @@ 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=none $TARGETIMAGE -cp locked-sigs.inc tmp/deploy/images/ +#bitbake --dump-signature $TARGETIMAGE +#cp locked-sigs.inc tmp/deploy/images/ du -hs tmp/deploy/* diff --git a/jjb/common/include-agl-run-ycl-ci.sh b/jjb/common/include-agl-run-ycl-ci.sh index 932e47fa..bdadbb6d 100644 --- a/jjb/common/include-agl-run-ycl-ci.sh +++ b/jjb/common/include-agl-run-ycl-ci.sh @@ -7,6 +7,9 @@ pushd . +external/poky/scripts/install-buildtools +source external/poky/buildtools/environment-setup-x86_64-pokysdk-linux + # meta-agl pushd meta-agl if test -x scripts/ci-yocto-check-layer.sh ; then diff --git a/jjb/common/include-agl-setup-and-bitbake-ivi-image.sh b/jjb/common/include-agl-setup-and-bitbake-ivi-image.sh index 5707b9c6..ce6584d3 100644 --- a/jjb/common/include-agl-setup-and-bitbake-ivi-image.sh +++ b/jjb/common/include-agl-setup-and-bitbake-ivi-image.sh @@ -4,66 +4,3 @@ ################################################################################ ## 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 diff --git a/jjb/common/include-agl-source-aglsetup.sh b/jjb/common/include-agl-source-aglsetup.sh index 44b6ae6c..3f6b4c9f 100644 --- a/jjb/common/include-agl-source-aglsetup.sh +++ b/jjb/common/include-agl-source-aglsetup.sh @@ -6,6 +6,10 @@ ################################################################################ SETUP_OPTS="" +external/poky/scripts/install-buildtools +source external/poky/buildtools/environment-setup-x86_64-pokysdk-linux + + # check aglsetup version source meta-agl/scripts/aglsetup.sh --version >/dev/null 2>&1 || AGLSETUP_VERSION=1.0.0 @@ -41,3 +45,6 @@ MACHINE=${MACHINE} GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER} GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER} EOF + + + diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh index dc5331ad..ab0cb7bf 100644 --- a/packer/provision/agl_dependencies.sh +++ b/packer/provision/agl_dependencies.sh @@ -20,18 +20,16 @@ echo "---> Removing Vexxhost Ubuntu mirrors" sed -i 's/ubuntu.mirror.vexxhost.com/us.archive.ubuntu.com/g' /etc/apt/sources.list # UPDATE things -sed -i -e "s,xenial,bionic,g" /etc/apt/sources.list +sed -i -e "s,xenial,focal,g" /etc/apt/sources.list sync cat /etc/apt/sources.list +DEBIAN_FRONTEND=noninteractive apt-get update DEBIAN_FRONTEND=noninteractive apt-get --purge remove plymouth-theme* plymouth - DEBIAN_FRONTEND=noninteractive apt-get autoremove - -DEBIAN_FRONTEND=noninteractive apt-get update && apt-get -y -u dist-upgrade - +DEBIAN_FRONTEND=noninteractive apt-get apt-get -y -u dist-upgrade DEBIAN_FRONTEND=noninteractive dpkg --configure -a DEBIAN_FRONTEND=noninteractive apt-get update && \ @@ -42,24 +40,15 @@ DEBIAN_FRONTEND=noninteractive apt-get update && \ ruby-all-dev ruby-ffi ruby-ffi-* jekyll ruby-redcarpet mkdocs \ python-pip python-simplejson g++-multilib make zip unzip iperf3 \ debian-keyring debian-archive-keyring python3-yaml python3-pip python-pip apt \ - liblz4-tool zstd + liblz4-tool zstd docker.io git diffstat unzip texinfo gcc build-essential \ + chrpath socat cpio python3 python3-pip python3-pexpect xz-utils debianutils \ + iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev pylint3 \ + xterm python3-subunit mesa-common-dev zstd liblz4-tool DEBIAN_FRONTEND=noninteractive apt-get clean - -DEBIAN_FRONTEND=noninteractive apt-get -y install linux-image-4.15.0-123-generic - +#DEBIAN_FRONTEND=noninteractive apt-get -y install linux-image-4.15.0-123-generic DEBIAN_FRONTEND=noninteractive apt full-upgrade -# Adding stretch-backports for lavacli -#echo "deb https://apt.lavasoftware.org/release buster-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 lavacli - sudo pip3 install --upgrade pip sudo pip3 install --upgrade --force-reinstall --ignore-installed pyyaml sudo pip3 install --upgrade --ignore-installed --force-reinstall lavacli==1.0 @@ -101,22 +90,6 @@ net.ipv6.conf.all.disable_ipv6 = 1 EOFSYSCTL -### webdocs + xds -# taken from container setup script. not documented in readme. -# install node.js and tools (npm, gulp, bower) -# -#curl -v --connect-timeout 60 --retry 3 -sL https://deb.nodesource.com/setup_12.x | bash - -#DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs -#which -a npm -#dpkg -L nodejs -#npm install --global gulp bower - -################### SDX181207 { - obsolete: section until closing brace should be removed after migration to next docsite -# tools used to generate developer website (https://github.com/automotive-grade-linux/docs-agl) -#gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 \ -# && curl -sSL https://get.rvm.io | bash -s stable --ruby --gems=jekyll - - mkdir -p /opt/AGL cd /opt/AGL/ @@ -124,9 +97,6 @@ git clone https://git.automotivelinux.org/AGL/documentation cd documentation sudo pip3 install -r requirements.txt -# ruby markdown linter -#sudo gem install mdl - # python markdown linter sudo pip3 install mdlint @@ -151,22 +121,7 @@ sudo pip3 install --upgrade jsonpatch python -c "import sys; print sys.path" -#sudo pip show jinja2 -#sudo pip3 show jinja2 - -# install go for xds build - . /etc/os-release -#wget -O - "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x52B59B1571A79DBC054901C0F6BC817356A3D45E" | sudo apt-key add - -#sudo bash -c "cat >> /etc/apt/sources.list.d/golang.list <<EOF -#deb http://ppa.launchpad.net/longsleep/golang-backports/ubuntu bionic main -#EOF" -#sudo apt-get update -#sudo apt-get install golang-go - -# Crossbuild standard go libraries for MacOS and Windows -#sudo GOOS=darwin GOARCH=amd64 go install -v -a std -#sudo GOOS=windows GOARCH=amd64 go install -v -a std useradd -m -s /bin/bash jenkins |