Update for scarthgap

Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Change-Id: Ieb277bf7ced1aafd70d0d6fdf73fa8a0508101e7

diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
index 5d4f4df..bc1f2f6 100644 (file)
--- 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 9d7edbe..84ecae0 100644 (file)
--- 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 4063444..dd65a6b 100644 (file)
--- 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 932e47f..bdadbb6 100644 (file)
--- 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 5707b9c..ce6584d 100644 (file)
--- 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 44b6ae6..3f6b4c9 100644 (file)
--- 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
+
+
+