mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 03:49:32 +02:00
bitbake: toaster: add 'nobuild' option to Toaster
Add a 'nobuild' option for starting Toaster without the project and hosted builds support. This allows a Toaster host to provide local build statistics without opening the host to external users building projects. [YOCTO #12315] (Bitbake rev: 2d14d6004b6add5ce07295fff1144ade2e54e1c9) Signed-off-by: David Reyna <David.Reyna@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
0d9914721a
commit
299e8ff1f7
@@ -18,9 +18,10 @@
|
|||||||
# along with this program. If not, see http://www.gnu.org/licenses/.
|
# along with this program. If not, see http://www.gnu.org/licenses/.
|
||||||
|
|
||||||
HELP="
|
HELP="
|
||||||
Usage: source toaster start|stop [webport=<address:port>] [noweb]
|
Usage: source toaster start|stop [webport=<address:port>] [noweb] [nobuild]
|
||||||
Optional arguments:
|
Optional arguments:
|
||||||
[noweb] Setup the environment for building with toaster but don't start the development server
|
[nobuild] Setup the environment for capturing builds with toaster but disable managed builds
|
||||||
|
[noweb] Setup the environment for capturing builds with toaster but don't start the web server
|
||||||
[webport] Set the development server (default: localhost:8000)
|
[webport] Set the development server (default: localhost:8000)
|
||||||
"
|
"
|
||||||
|
|
||||||
@@ -183,6 +184,7 @@ unset OE_ROOT
|
|||||||
|
|
||||||
|
|
||||||
WEBSERVER=1
|
WEBSERVER=1
|
||||||
|
export TOASTER_BUILDSERVER=1
|
||||||
ADDR_PORT="localhost:8000"
|
ADDR_PORT="localhost:8000"
|
||||||
unset CMD
|
unset CMD
|
||||||
for param in $*; do
|
for param in $*; do
|
||||||
@@ -190,6 +192,9 @@ for param in $*; do
|
|||||||
noweb )
|
noweb )
|
||||||
WEBSERVER=0
|
WEBSERVER=0
|
||||||
;;
|
;;
|
||||||
|
nobuild )
|
||||||
|
TOASTER_BUILDSERVER=0
|
||||||
|
;;
|
||||||
start )
|
start )
|
||||||
CMD=$param
|
CMD=$param
|
||||||
;;
|
;;
|
||||||
@@ -286,9 +291,13 @@ case $CMD in
|
|||||||
return 4
|
return 4
|
||||||
fi
|
fi
|
||||||
export BITBAKE_UI='toasterui'
|
export BITBAKE_UI='toasterui'
|
||||||
$MANAGE runbuilds \
|
if [ $TOASTER_BUILDSERVER -eq 1 ] ; then
|
||||||
</dev/null >>${BUILDDIR}/toaster_runbuilds.log 2>&1 \
|
$MANAGE runbuilds \
|
||||||
& echo $! >${BUILDDIR}/.runbuilds.pid
|
</dev/null >>${BUILDDIR}/toaster_runbuilds.log 2>&1 \
|
||||||
|
& echo $! >${BUILDDIR}/.runbuilds.pid
|
||||||
|
else
|
||||||
|
echo "Toaster build server not started."
|
||||||
|
fi
|
||||||
|
|
||||||
# set fail safe stop system on terminal exit
|
# set fail safe stop system on terminal exit
|
||||||
trap stop_system SIGHUP
|
trap stop_system SIGHUP
|
||||||
|
|||||||
@@ -110,6 +110,7 @@
|
|||||||
All builds
|
All builds
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
{% if project_enable %}
|
||||||
<li id="navbar-all-projects"
|
<li id="navbar-all-projects"
|
||||||
{% if request.resolver_match.url_name == 'all-projects' %}
|
{% if request.resolver_match.url_name == 'all-projects' %}
|
||||||
class="active"
|
class="active"
|
||||||
@@ -119,6 +120,7 @@
|
|||||||
All projects
|
All projects
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<li id="navbar-docs">
|
<li id="navbar-docs">
|
||||||
<a target="_blank" href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html">
|
<a target="_blank" href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html">
|
||||||
@@ -127,7 +129,9 @@
|
|||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
{% if project_enable %}
|
||||||
<a class="btn btn-default navbar-btn navbar-right" id="new-project-button" href="{% url 'newproject' %}">New project</a>
|
<a class="btn btn-default navbar-btn navbar-right" id="new-project-button" href="{% url 'newproject' %}">New project</a>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
|
|||||||
@@ -21,11 +21,13 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
{% if lvs_nos %}
|
{% if lvs_nos %}
|
||||||
|
{% if project_enable %}
|
||||||
<p class="top-air">
|
<p class="top-air">
|
||||||
<a class="btn btn-primary btn-lg" href="{% url 'newproject' %}">
|
<a class="btn btn-primary btn-lg" href="{% url 'newproject' %}">
|
||||||
Create your first Toaster project to run manage builds
|
Create your first Toaster project to run manage builds
|
||||||
</a>
|
</a>
|
||||||
</p>
|
</p>
|
||||||
|
{% endif %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="alert alert-info lead top-air">
|
<div class="alert alert-info lead top-air">
|
||||||
Toaster has no layer information. Without layer information, you cannot run builds. To generate layer information you can:
|
Toaster has no layer information. Without layer information, you cannot run builds. To generate layer information you can:
|
||||||
|
|||||||
@@ -49,6 +49,8 @@ import logging
|
|||||||
|
|
||||||
logger = logging.getLogger("toaster")
|
logger = logging.getLogger("toaster")
|
||||||
|
|
||||||
|
# Project creation and managed build enable
|
||||||
|
project_enable = ('1' == os.environ.get('TOASTER_BUILDSERVER'))
|
||||||
|
|
||||||
class MimeTypeFinder(object):
|
class MimeTypeFinder(object):
|
||||||
# setting this to False enables additional non-standard mimetypes
|
# setting this to False enables additional non-standard mimetypes
|
||||||
@@ -65,6 +67,12 @@ class MimeTypeFinder(object):
|
|||||||
guessed_type = 'application/octet-stream'
|
guessed_type = 'application/octet-stream'
|
||||||
return guessed_type
|
return guessed_type
|
||||||
|
|
||||||
|
# single point to add global values into the context before rendering
|
||||||
|
def toaster_render(request, page, context):
|
||||||
|
context['project_enable'] = project_enable
|
||||||
|
return render(request, page, context)
|
||||||
|
|
||||||
|
|
||||||
# all new sessions should come through the landing page;
|
# all new sessions should come through the landing page;
|
||||||
# determine in which mode we are running in, and redirect appropriately
|
# determine in which mode we are running in, and redirect appropriately
|
||||||
def landing(request):
|
def landing(request):
|
||||||
@@ -86,7 +94,7 @@ def landing(request):
|
|||||||
|
|
||||||
context = {'lvs_nos' : Layer_Version.objects.all().count()}
|
context = {'lvs_nos' : Layer_Version.objects.all().count()}
|
||||||
|
|
||||||
return render(request, 'landing.html', context)
|
return toaster_render(request, 'landing.html', context)
|
||||||
|
|
||||||
def objtojson(obj):
|
def objtojson(obj):
|
||||||
from django.db.models.query import QuerySet
|
from django.db.models.query import QuerySet
|
||||||
@@ -519,7 +527,7 @@ def builddashboard( request, build_id ):
|
|||||||
'packagecount' : packageCount,
|
'packagecount' : packageCount,
|
||||||
'logmessages' : logmessages,
|
'logmessages' : logmessages,
|
||||||
}
|
}
|
||||||
return render( request, template, context )
|
return toaster_render( request, template, context )
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -591,7 +599,7 @@ def task( request, build_id, task_id ):
|
|||||||
build__completed_on__lt=task_object.build.completed_on).exclude(
|
build__completed_on__lt=task_object.build.completed_on).exclude(
|
||||||
order__isnull=True).exclude(outcome=Task.OUTCOME_NA).order_by('-build__completed_on')
|
order__isnull=True).exclude(outcome=Task.OUTCOME_NA).order_by('-build__completed_on')
|
||||||
|
|
||||||
return render( request, template, context )
|
return toaster_render( request, template, context )
|
||||||
|
|
||||||
def recipe(request, build_id, recipe_id, active_tab="1"):
|
def recipe(request, build_id, recipe_id, active_tab="1"):
|
||||||
template = "recipe.html"
|
template = "recipe.html"
|
||||||
@@ -618,7 +626,7 @@ def recipe(request, build_id, recipe_id, active_tab="1"):
|
|||||||
'package_count' : package_count,
|
'package_count' : package_count,
|
||||||
'tab_states' : tab_states,
|
'tab_states' : tab_states,
|
||||||
}
|
}
|
||||||
return render(request, template, context)
|
return toaster_render(request, template, context)
|
||||||
|
|
||||||
def recipe_packages(request, build_id, recipe_id):
|
def recipe_packages(request, build_id, recipe_id):
|
||||||
template = "recipe_packages.html"
|
template = "recipe_packages.html"
|
||||||
@@ -663,7 +671,7 @@ def recipe_packages(request, build_id, recipe_id):
|
|||||||
},
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
response = render(request, template, context)
|
response = toaster_render(request, template, context)
|
||||||
_set_parameters_values(pagesize, orderby, request)
|
_set_parameters_values(pagesize, orderby, request)
|
||||||
return response
|
return response
|
||||||
|
|
||||||
@@ -785,7 +793,7 @@ def dirinfo(request, build_id, target_id, file_path=None):
|
|||||||
'dir_list': dir_list,
|
'dir_list': dir_list,
|
||||||
'file_path': file_path,
|
'file_path': file_path,
|
||||||
}
|
}
|
||||||
return render(request, template, context)
|
return toaster_render(request, template, context)
|
||||||
|
|
||||||
def _find_task_dep(task_object):
|
def _find_task_dep(task_object):
|
||||||
tdeps = Task_Dependency.objects.filter(task=task_object).filter(depends_on__order__gt=0)
|
tdeps = Task_Dependency.objects.filter(task=task_object).filter(depends_on__order__gt=0)
|
||||||
@@ -837,7 +845,7 @@ def configuration(request, build_id):
|
|||||||
'build': build,
|
'build': build,
|
||||||
'project': build.project,
|
'project': build.project,
|
||||||
'targets': Target.objects.filter(build=build_id)})
|
'targets': Target.objects.filter(build=build_id)})
|
||||||
return render(request, template, context)
|
return toaster_render(request, template, context)
|
||||||
|
|
||||||
|
|
||||||
def configvars(request, build_id):
|
def configvars(request, build_id):
|
||||||
@@ -926,7 +934,7 @@ def configvars(request, build_id):
|
|||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
response = render(request, template, context)
|
response = toaster_render(request, template, context)
|
||||||
_set_parameters_values(pagesize, orderby, request)
|
_set_parameters_values(pagesize, orderby, request)
|
||||||
return response
|
return response
|
||||||
|
|
||||||
@@ -939,7 +947,7 @@ def bfile(request, build_id, package_id):
|
|||||||
'project': build.project,
|
'project': build.project,
|
||||||
'objects' : files
|
'objects' : files
|
||||||
}
|
}
|
||||||
return render(request, template, context)
|
return toaster_render(request, template, context)
|
||||||
|
|
||||||
|
|
||||||
# A set of dependency types valid for both included and built package views
|
# A set of dependency types valid for both included and built package views
|
||||||
@@ -1092,7 +1100,7 @@ def package_built_detail(request, build_id, package_id):
|
|||||||
if paths.all().count() < 2:
|
if paths.all().count() < 2:
|
||||||
context['disable_sort'] = True;
|
context['disable_sort'] = True;
|
||||||
|
|
||||||
response = render(request, template, context)
|
response = toaster_render(request, template, context)
|
||||||
_set_parameters_values(pagesize, orderby, request)
|
_set_parameters_values(pagesize, orderby, request)
|
||||||
return response
|
return response
|
||||||
|
|
||||||
@@ -1111,7 +1119,7 @@ def package_built_dependencies(request, build_id, package_id):
|
|||||||
'other_deps' : dependencies['other_deps'],
|
'other_deps' : dependencies['other_deps'],
|
||||||
'dependency_count' : _get_package_dependency_count(package, -1, False)
|
'dependency_count' : _get_package_dependency_count(package, -1, False)
|
||||||
}
|
}
|
||||||
return render(request, template, context)
|
return toaster_render(request, template, context)
|
||||||
|
|
||||||
|
|
||||||
def package_included_detail(request, build_id, target_id, package_id):
|
def package_included_detail(request, build_id, target_id, package_id):
|
||||||
@@ -1157,7 +1165,7 @@ def package_included_detail(request, build_id, target_id, package_id):
|
|||||||
}
|
}
|
||||||
if paths.all().count() < 2:
|
if paths.all().count() < 2:
|
||||||
context['disable_sort'] = True
|
context['disable_sort'] = True
|
||||||
response = render(request, template, context)
|
response = toaster_render(request, template, context)
|
||||||
_set_parameters_values(pagesize, orderby, request)
|
_set_parameters_values(pagesize, orderby, request)
|
||||||
return response
|
return response
|
||||||
|
|
||||||
@@ -1181,7 +1189,7 @@ def package_included_dependencies(request, build_id, target_id, package_id):
|
|||||||
'reverse_count' : _get_package_reverse_dep_count(package, target_id),
|
'reverse_count' : _get_package_reverse_dep_count(package, target_id),
|
||||||
'dependency_count' : _get_package_dependency_count(package, target_id, True)
|
'dependency_count' : _get_package_dependency_count(package, target_id, True)
|
||||||
}
|
}
|
||||||
return render(request, template, context)
|
return toaster_render(request, template, context)
|
||||||
|
|
||||||
def package_included_reverse_dependencies(request, build_id, target_id, package_id):
|
def package_included_reverse_dependencies(request, build_id, target_id, package_id):
|
||||||
template = "package_included_reverse_dependencies.html"
|
template = "package_included_reverse_dependencies.html"
|
||||||
@@ -1232,7 +1240,7 @@ def package_included_reverse_dependencies(request, build_id, target_id, package_
|
|||||||
}
|
}
|
||||||
if objects.all().count() < 2:
|
if objects.all().count() < 2:
|
||||||
context['disable_sort'] = True
|
context['disable_sort'] = True
|
||||||
response = render(request, template, context)
|
response = toaster_render(request, template, context)
|
||||||
_set_parameters_values(pagesize, orderby, request)
|
_set_parameters_values(pagesize, orderby, request)
|
||||||
return response
|
return response
|
||||||
|
|
||||||
@@ -1365,6 +1373,9 @@ if True:
|
|||||||
|
|
||||||
# new project
|
# new project
|
||||||
def newproject(request):
|
def newproject(request):
|
||||||
|
if not project_enable:
|
||||||
|
return redirect( landing )
|
||||||
|
|
||||||
template = "newproject.html"
|
template = "newproject.html"
|
||||||
context = {
|
context = {
|
||||||
'email': request.user.email if request.user.is_authenticated() else '',
|
'email': request.user.email if request.user.is_authenticated() else '',
|
||||||
@@ -1379,7 +1390,7 @@ if True:
|
|||||||
|
|
||||||
if request.method == "GET":
|
if request.method == "GET":
|
||||||
# render new project page
|
# render new project page
|
||||||
return render(request, template, context)
|
return toaster_render(request, template, context)
|
||||||
elif request.method == "POST":
|
elif request.method == "POST":
|
||||||
mandatory_fields = ['projectname', 'ptype']
|
mandatory_fields = ['projectname', 'ptype']
|
||||||
try:
|
try:
|
||||||
@@ -1419,7 +1430,7 @@ if True:
|
|||||||
context['alert'] = "Your chosen username is already used"
|
context['alert'] = "Your chosen username is already used"
|
||||||
else:
|
else:
|
||||||
context['alert'] = str(e)
|
context['alert'] = str(e)
|
||||||
return render(request, template, context)
|
return toaster_render(request, template, context)
|
||||||
|
|
||||||
raise Exception("Invalid HTTP method for this page")
|
raise Exception("Invalid HTTP method for this page")
|
||||||
|
|
||||||
@@ -1427,7 +1438,7 @@ if True:
|
|||||||
def project(request, pid):
|
def project(request, pid):
|
||||||
project = Project.objects.get(pk=pid)
|
project = Project.objects.get(pk=pid)
|
||||||
context = {"project": project}
|
context = {"project": project}
|
||||||
return render(request, "project.html", context)
|
return toaster_render(request, "project.html", context)
|
||||||
|
|
||||||
def jsunittests(request):
|
def jsunittests(request):
|
||||||
""" Provides a page for the js unit tests """
|
""" Provides a page for the js unit tests """
|
||||||
@@ -1453,7 +1464,7 @@ if True:
|
|||||||
name="MACHINE",
|
name="MACHINE",
|
||||||
value="qemux86")
|
value="qemux86")
|
||||||
context = {'project': new_project}
|
context = {'project': new_project}
|
||||||
return render(request, "js-unit-tests.html", context)
|
return toaster_render(request, "js-unit-tests.html", context)
|
||||||
|
|
||||||
from django.views.decorators.csrf import csrf_exempt
|
from django.views.decorators.csrf import csrf_exempt
|
||||||
@csrf_exempt
|
@csrf_exempt
|
||||||
@@ -1588,7 +1599,7 @@ if True:
|
|||||||
context = {
|
context = {
|
||||||
'project': Project.objects.get(id=pid),
|
'project': Project.objects.get(id=pid),
|
||||||
}
|
}
|
||||||
return render(request, template, context)
|
return toaster_render(request, template, context)
|
||||||
|
|
||||||
def layerdetails(request, pid, layerid):
|
def layerdetails(request, pid, layerid):
|
||||||
project = Project.objects.get(pk=pid)
|
project = Project.objects.get(pk=pid)
|
||||||
@@ -1617,7 +1628,7 @@ if True:
|
|||||||
'projectlayers': list(project_layers)
|
'projectlayers': list(project_layers)
|
||||||
}
|
}
|
||||||
|
|
||||||
return render(request, 'layerdetails.html', context)
|
return toaster_render(request, 'layerdetails.html', context)
|
||||||
|
|
||||||
|
|
||||||
def get_project_configvars_context():
|
def get_project_configvars_context():
|
||||||
@@ -1707,7 +1718,7 @@ if True:
|
|||||||
except (ProjectVariable.DoesNotExist, BuildEnvironment.DoesNotExist):
|
except (ProjectVariable.DoesNotExist, BuildEnvironment.DoesNotExist):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
return render(request, "projectconf.html", context)
|
return toaster_render(request, "projectconf.html", context)
|
||||||
|
|
||||||
def _file_names_for_artifact(build, artifact_type, artifact_id):
|
def _file_names_for_artifact(build, artifact_type, artifact_id):
|
||||||
"""
|
"""
|
||||||
@@ -1774,7 +1785,7 @@ if True:
|
|||||||
|
|
||||||
return response
|
return response
|
||||||
else:
|
else:
|
||||||
return render(request, "unavailable_artifact.html")
|
return toaster_render(request, "unavailable_artifact.html")
|
||||||
except (ObjectDoesNotExist, IOError):
|
except (ObjectDoesNotExist, IOError):
|
||||||
return render(request, "unavailable_artifact.html")
|
return toaster_render(request, "unavailable_artifact.html")
|
||||||
|
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ import types
|
|||||||
import json
|
import json
|
||||||
import collections
|
import collections
|
||||||
import re
|
import re
|
||||||
|
import os
|
||||||
|
|
||||||
from toastergui.tablefilter import TableFilterMap
|
from toastergui.tablefilter import TableFilterMap
|
||||||
|
|
||||||
@@ -86,6 +87,9 @@ class ToasterTable(TemplateView):
|
|||||||
context['table_name'] = type(self).__name__.lower()
|
context['table_name'] = type(self).__name__.lower()
|
||||||
context['empty_state'] = self.empty_state
|
context['empty_state'] = self.empty_state
|
||||||
|
|
||||||
|
# global variables
|
||||||
|
context['project_enable'] = ('1' == os.environ.get('TOASTER_BUILDSERVER'))
|
||||||
|
|
||||||
return context
|
return context
|
||||||
|
|
||||||
def get(self, request, *args, **kwargs):
|
def get(self, request, *args, **kwargs):
|
||||||
|
|||||||
Reference in New Issue
Block a user