From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 96841E00931; Wed, 23 Mar 2016 03:35:39 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high * trust * [134.134.136.65 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id E65DCE00920 for ; Wed, 23 Mar 2016 03:35:32 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP; 23 Mar 2016 03:35:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,382,1455004800"; d="scan'208";a="930082242" Received: from linux.intel.com ([10.23.219.25]) by fmsmga001.fm.intel.com with ESMTP; 23 Mar 2016 03:35:31 -0700 Received: from vmed.fi.intel.com (vmed.fi.intel.com [10.237.72.51]) by linux.intel.com (Postfix) with ESMTP id 501AB6A4002 for ; Wed, 23 Mar 2016 04:23:14 -0700 (PDT) From: Ed Bartosh To: toaster@yoctoproject.org Date: Wed, 23 Mar 2016 10:14:51 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 Subject: [PATCH v6 00/41] per project build directory + build cancel + DL_DIR/SSTATE_DIR X-BeenThere: toaster@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Web based interface for BitBake List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Mar 2016 10:35:39 -0000 Hi, Default build directory is not going to be used for project builds anymore. It can be used only for command line builds. Toaster will use build-toaster- directories for project builds. The patchset also contains implementation of build cancelation(#6787) and setting of DL_DIR and SSTATE_DIR project variables. This work was done by Sujith and Michael. This patchset fixes the following bugs: 7880 2.1M3 Medium+/Normal: Toaster uses the same /tmp dir across releases 9058 2.1 Medium/Normal: Bad project MACHINE setting in conf/toaster.conf causes command line builds to fail 8958 2.1M3 Medium/Normal: Toaster does not build with the Jethro release 6787 2.1 Medium/Enhancement: Cancelling builds at any point in the build process 8422 2.1 Medium/Enhancement: we currently don't allow setting of sstate_dir or dl_dir This is how to test this: - run toaster - run command line build: build zlib - check if it's shown in Toaster UI - create project for Yocto master - trigger project build from UI - wait until it succeeds - create project for Jethro - check that DL_DIR and SSTATE_DIR variables point to the same location for both projects - trigger project build from UI - wait until it succeds - check that 2 build directories build-toaster- exist and contain correct conf/toaster.conf and conf/bblayers.conf - trigger any build from UI again and try to cancel it Changes in v2: stop bitbake server after the build Changes in v3: fixed '/bin/sh: 1: source: not found' dash issue used project id in build directory name added 'INHERIT+='toaster buildhistory' to conf/local.conf on toaster start Changes in v4: fixed builds on Ubuntu caused by dash being default shell Changes in v5: fixed nasty bug in toasterui causing it to stuck in event loop Changes in v6: added fix for 6787 build cancelation patchset added fix for 8422 (DL_DIR and SSTATE_DIR) patchset run bitbake client from sourcedir/bitbake/bin fixed empty image data fixed couple of crashes in buildinfohelper code rebased on top of toaster-next@March 23rd 10:20 GMT The following changes since commit 59805259d6d41e5b33dee70a74a6892be37d253d: toaster: orm generate CustomImageRecipe contents try secondary path (2016-03-23 08:19:19 +0000) are available in the git repository at: git://git.yoctoproject.org/poky-contrib ed/toaster/project-build-dir-cancel-dldir_sstatedir http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/toaster/project-build-dir-cancel-dldir_sstatedir Ed Bartosh (24): toaster: don't start bitbake server toaster: get rid of noui option toaster: set BITBAKE_UI environment variable toasterui: add brbe parameter to buildinfohelper uievent: improve BBUIEventQueue code buildinfohelper: improve handling of providermap toasterui: fix brbe reporting toaster: remove startBBServer API toaster: remove release API toaster: add brbe parameter to triggerBuild toaster: modified setLayers API toaster: reimplement triggerBuild toaster: add new parameter to _shellcmd toaster: stop bitbake server after the build toaster: update conf/local.conf toaster: fix jethro build toaster: use bash explicitly toasterui: shutdown on BuildCompleted event toaster: fix conflicting migrations toaster: use empty token toaster: add DL_DIR and SSTATE_DIR to oe toasterconf toaster: use bitbake from sourcedir/bitbake/bin buildinfohelper: fix KeyError toasterui: fix warning 'Unknown event' Elliot Smith (1): toasterui: detect build run start correctly on Jethro Michael Wood (9): toaster: Move xhr calls for starting and stopping builds toaster: xhr Update the implementation of the build cancellation request toaster: libtoaster Update implementation of startABuild and cancelABuild toaster: bldcontrol models Add a cancelling state the BuildRequest buildinfohelper: Add handler for cancelling a build toaster: mrb_section template Add build cancel button toaster: models Exclude the CANCELLED builds from get_number_of_builds toaster: runbuilds Make runbuilds aware of the build CANCELLED state toaster: runbuilds Clean up runbuilds Sujith H (7): toaster: bldcontrol Add forceShutDown function to BitbakeController toaster: update BuildEnvironmentController and BitbakeController toaster: models Add cancelled state to build outcome toaster: tables BuildsTable exclude cancelled builds toaster: add DL_DIR and SSTATE_DIR to poky toasterconf toaster: update view to support DL_DIR and SSTATE_DIR toaster: update projectconf.html for DL_DIR and SSTATE_DIR bitbake/bin/toaster | 79 ++-------- bitbake/lib/bb/ui/buildinfohelper.py | 57 +++++--- bitbake/lib/bb/ui/toasterui.py | 54 ++++--- bitbake/lib/bb/ui/uievent.py | 10 +- bitbake/lib/toaster/bldcontrol/bbcontroller.py | 62 +------- .../toaster/bldcontrol/localhostbecontroller.py | 149 +++++++++---------- .../bldcontrol/management/commands/runbuilds.py | 109 +++++++++----- .../migrations/0002_add_cancelling_state.py | 19 +++ .../toaster/bldcontrol/migrations/0003_merge.py | 15 ++ bitbake/lib/toaster/bldcontrol/models.py | 27 +++- .../orm/migrations/0006_add_cancelled_state.py | 19 +++ bitbake/lib/toaster/orm/migrations/0007_merge.py | 15 ++ bitbake/lib/toaster/orm/models.py | 12 +- bitbake/lib/toaster/toastergui/api.py | 110 ++++++++++++++ .../toaster/toastergui/static/js/customrecipe.js | 4 +- .../lib/toaster/toastergui/static/js/layerBtn.js | 3 +- .../lib/toaster/toastergui/static/js/libtoaster.js | 41 ++++-- .../lib/toaster/toastergui/static/js/mrbsection.js | 95 ++++++++++++ .../toaster/toastergui/static/js/projectpage.js | 4 +- .../toaster/toastergui/static/js/projecttopbar.js | 6 +- .../toaster/toastergui/static/js/recipedetails.js | 4 +- bitbake/lib/toaster/toastergui/tables.py | 48 +------ bitbake/lib/toaster/toastergui/templates/base.html | 1 + .../toaster/toastergui/templates/mrb_section.html | 148 +++++++------------ .../toaster/toastergui/templates/projectconf.html | 160 ++++++++++++++++++++- bitbake/lib/toaster/toastergui/urls.py | 5 + bitbake/lib/toaster/toastergui/views.py | 40 +++++- meta-poky/conf/toasterconf.json | 4 +- meta/conf/toasterconf.json | 4 +- 29 files changed, 848 insertions(+), 456 deletions(-) create mode 100644 bitbake/lib/toaster/bldcontrol/migrations/0002_add_cancelling_state.py create mode 100644 bitbake/lib/toaster/bldcontrol/migrations/0003_merge.py create mode 100644 bitbake/lib/toaster/orm/migrations/0006_add_cancelled_state.py create mode 100644 bitbake/lib/toaster/orm/migrations/0007_merge.py create mode 100644 bitbake/lib/toaster/toastergui/api.py create mode 100644 bitbake/lib/toaster/toastergui/static/js/mrbsection.js -- Regards, Ed