diff --git a/.gitignore b/.gitignore
index 5b106cc..1c3a481 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,16 @@ node_modules/
*.sqlite-wal
*.pid
*.map
+state.sqlite
+master.cfg.sample
+
+# Builders
+workers
+linux_glibc219_i686_cmake
+linux_glibc219_x86_64_cmake
+mac_x86_64_10_6_cmake
+win32_cmake_vc2013
+win32_cmake_vc2015
+win64_cmake_vc2013
+win64_cmake_vc2015
+
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 6a4f770..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "public_html/assets_shared"]
- path = public_html/assets_shared
- url = git://git.blender.org/blender-web-assets.git
diff --git a/Gruntfile.js b/Gruntfile.js
deleted file mode 100644
index 3b10ba4..0000000
--- a/Gruntfile.js
+++ /dev/null
@@ -1,31 +0,0 @@
-module.exports = function(grunt) {
- grunt.initConfig({
- pkg: grunt.file.readJSON('package.json'),
-
- sass: {
- dist: {
- options: {
- style: 'compressed'
- },
- files: {
- 'public_html/assets/css/main.css': 'public_html/assets/sass/main.sass'
- }
- }
- },
-
- autoprefixer: {
- no_dest: { src: 'public_html/assets/css/main.css' }
- },
-
- watch: {
- files: ['public_html/assets/sass/main.sass'],
- tasks: ['sass', 'autoprefixer'],
- }
- });
-
- grunt.loadNpmTasks('grunt-contrib-sass');
- grunt.loadNpmTasks('grunt-autoprefixer');
- grunt.loadNpmTasks('grunt-contrib-watch');
-
- grunt.registerTask('default', ['sass', 'autoprefixer', 'watch']);
-};
diff --git a/master.cfg b/master.cfg
index ac75d48..7df5bd9 100644
--- a/master.cfg
+++ b/master.cfg
@@ -9,81 +9,40 @@ NIGHT_SCHEDULE_BRANCHES = [None, "blender2.7"]
# List of the branches available for force build
FORCE_SCHEDULE_BRANCHES = ["master", "blender2.7", "experimental-build"]
-"""
-Stock Twisted directory lister doesn't provide any information about last file
-modification time, we hack the class a bit in order to have such functionaliity
-:)
-"""
+# List of branches availble for addons branch selection.
+ADDONS_BRANCHES = ["master", "blender2.7"]
-from buildbot.status.web.base import DirectoryLister
-
-
-def get_files_and_directories(self, directory):
- from twisted.web.static import (getTypeAndEncoding,
- formatFileSize)
- import urllib
- import cgi
- import time
- import os
- files = []
- dirs = []
- for path in directory:
- url = urllib.quote(path, "/")
- escapedPath = cgi.escape(path)
- lastmodified = time.ctime(os.path.getmtime(
- os.path.join(self.path, path)))
- if os.path.isdir(os.path.join(self.path, path)):
- url = url + '/'
- dirs.append({'text': escapedPath + "/", 'href': url,
- 'size': '', 'type': '[Directory]',
- 'encoding': '',
- 'lastmodified': lastmodified})
- else:
- mimetype, encoding = getTypeAndEncoding(path, self.contentTypes,
- self.contentEncodings,
- self.defaultType)
- try:
- size = os.stat(os.path.join(self.path, path)).st_size
- except OSError:
- continue
- files.append({
- 'text': escapedPath, "href": url,
- 'type': '[%s]' % mimetype,
- 'encoding': (encoding and '[%s]' % encoding or ''),
- 'size': formatFileSize(size),
- 'lastmodified': lastmodified})
- return dirs, files
-DirectoryLister._getFilesAndDirectories = get_files_and_directories
+# List of branches availble for libraries branch selection.
+LIB_BRANCHES = ["trunk"]
# Dictionary that the buildmaster pays attention to.
c = BuildmasterConfig = {}
-# BUILD SLAVES
+# BUILD WORKERS
#
# We load the slaves and their passwords from a separator file, so we can have
# this one in SVN.
-from buildbot.buildslave import BuildSlave
+from buildbot.worker import Worker
import master_private
-c['slaves'] = []
-
+c['workers'] = []
for slave in master_private.slaves:
- c['slaves'].append(BuildSlave(slave['name'], slave['password']))
+ c['workers'].append(Worker(slave['name'], slave['password']))
# TCP port through which slaves connect
-
-c['slavePortnum'] = 9989
-
+c['protocols'] = {
+ "pb": {
+ "port": "tcp:{}".format(9989)
+ }
+}
# CHANGE SOURCES
from buildbot.changes.svnpoller import SVNPoller
from buildbot.changes.gitpoller import GitPoller
-c['change_source'] = GitPoller(
- 'git://git.blender.org/blender.git',
- pollinterval=1200)
-
+c['change_source'] = GitPoller('git://git.blender.org/blender.git',
+ pollinterval=1200)
# CODEBASES
#
@@ -102,6 +61,7 @@ all_repositories = {
def codebaseGenerator(chdict):
return all_repositories[chdict['repository']]
+
c['codebaseGenerator'] = codebaseGenerator
@@ -109,55 +69,121 @@ c['codebaseGenerator'] = codebaseGenerator
#
# Decide how to react to incoming changes.
-# from buildbot.scheduler import Scheduler
from buildbot.schedulers import timed, forcesched
c['schedulers'] = []
def schedule_force_build(name):
- c['schedulers'].append(forcesched.ForceScheduler(name='force ' + name,
+ """
+ Makes it possible to have "Force Build" for the given builder.
+ Makes sure only reasonabel subset of properties are exposed.
+ """
+ c['schedulers'].append(forcesched.ForceScheduler(
+ name='force_' + name,
+ buttonName="Force Build",
builderNames=[name],
codebases=[forcesched.CodebaseParameter(
codebase="blender",
branch=forcesched.ChoiceStringParameter(
- name="branch", choices=FORCE_SCHEDULE_BRANCHES, default="master"),
+ name="branch",
+ choices=FORCE_SCHEDULE_BRANCHES,
+ default="master"),
# Do not hide revision, can be handy!
- repository=forcesched.FixedParameter(name="repository", default="", hide=True),
- project=forcesched.FixedParameter(name="project", default="", hide=True)),
- # For now, hide other codebases.
- forcesched.CodebaseParameter(hide=True, codebase="blender-translations"),
- forcesched.CodebaseParameter(
- codebase="blender-addons",
- branch=forcesched.ChoiceStringParameter(
- name="branch", choices=["master", "blender2.7"], default="master"),
- repository=forcesched.FixedParameter(name="repository", default="", hide=True),
- project=forcesched.FixedParameter(name="project", default="", hide=True),
- revision=forcesched.FixedParameter(name="revision", default="", hide=True),
- ),
- forcesched.CodebaseParameter(hide=True, codebase="blender-addons-contrib"),
- forcesched.CodebaseParameter(hide=True, codebase="blender-dev-tools"),
- forcesched.CodebaseParameter(hide=True, codebase="lib svn")],
+ repository=forcesched.FixedParameter(
+ name="repository",
+ default="",
+ hide=True),
+ project=forcesched.FixedParameter(
+ name="project",
+ default="",
+ hide=True)),
+ # For now, hide other codebases.
+ forcesched.CodebaseParameter(
+ hide=True,
+ codebase="blender-translations"),
+ forcesched.CodebaseParameter(
+ codebase="blender-addons",
+ branch=forcesched.ChoiceStringParameter(
+ name="branch",
+ choices=ADDONS_BRANCHES,
+ default="master"),
+ repository=forcesched.FixedParameter(name="repository",
+ default="",
+ hide=True),
+ project=forcesched.FixedParameter(name="project",
+ default="",
+ hide=True),
+ revision=forcesched.FixedParameter(name="revision",
+ default="",
+ hide=True),
+ ),
+ forcesched.CodebaseParameter(
+ codebase="blender-addons-contrib",
+ branch=forcesched.ChoiceStringParameter(
+ name="branch",
+ choices=ADDONS_BRANCHES,
+ default="master"),
+ repository=forcesched.FixedParameter(name="repository",
+ default="",
+ hide=True),
+ project=forcesched.FixedParameter(name="project",
+ default="",
+ hide=True),
+ revision=forcesched.FixedParameter(name="revision",
+ default="",
+ hide=True),
+ ),
+ forcesched.CodebaseParameter(
+ hide=True,
+ codebase="blender-dev-tools"),
+ forcesched.CodebaseParameter(
+ codebase="lib svn",
+ branch=forcesched.ChoiceStringParameter(
+ name="branch",
+ choices=LIB_BRANCHES,
+ default="trunk"),
+ repository=forcesched.FixedParameter(name="repository",
+ default="",
+ hide=True),
+ project=forcesched.FixedParameter(name="project",
+ default="",
+ hide=True),
+ revision=forcesched.FixedParameter(name="revision",
+ default="",
+ hide=True),
+ ),
+ ],
properties=[]))
-def schedule_build(name, hour, minute=0):
+def schedule_nightly_build(name, hour, minute=0):
+ """
+ Creates scheduler for nightly builds for a given builder.
+ """
for current_branch in NIGHT_SCHEDULE_BRANCHES:
- scheduler_name = "nightly " + name
+ scheduler_name = "nightly_" + name
if current_branch:
scheduler_name += ' ' + current_branch
# Use special addons submodule branch when building blender2.7 branch.
addons_branch = "master"
if current_branch == "blender2.7":
addons_branch = "blender2.7"
- c['schedulers'].append(timed.Nightly(name=scheduler_name,
+ c['schedulers'].append(timed.Nightly(
+ name=scheduler_name,
codebases={
- "blender": {"repository": ""},
- "blender-translations": {"repository": "", "branch": "master"},
- "blender-addons": {"repository": "", "branch": addons_branch},
- "blender-addons-contrib": {"repository": "", "branch": "master"},
- "blender-dev-tools": {"repository": "", "branch": "master"},
- "lib svn": {"repository": "", "branch": "trunk"}},
+ "blender": {"repository": "",
+ "branch": current_branch},
+ "blender-translations": {"repository": "",
+ "branch": "master"},
+ "blender-addons": {"repository": "",
+ "branch": addons_branch},
+ "blender-addons-contrib": {"repository": "",
+ "branch": addons_branch},
+ "blender-dev-tools": {"repository": "",
+ "branch": "master"},
+ "lib svn": {"repository": "",
+ "branch": "trunk"}},
branch=current_branch,
builderNames=[name],
hour=hour,
@@ -170,16 +196,15 @@ def schedule_build(name, hour, minute=0):
# perform a build: what steps, and which slaves can execute them.
# Note that any particular build will only take place on one slave.
+from buildbot.config import BuilderConfig
+from buildbot.plugins import steps, util
from buildbot.process.factory import BuildFactory
from buildbot.process.properties import Interpolate
-from buildbot.steps.source import SVN
-from buildbot.steps.source import Git
from buildbot.steps.shell import ShellCommand
from buildbot.steps.shell import Compile
from buildbot.steps.shell import Test
from buildbot.steps.transfer import FileUpload
from buildbot.steps.master import MasterShellCommand
-from buildbot.config import BuilderConfig
# add builder utility
@@ -189,50 +214,50 @@ buildernames = []
def add_builder(c, name, libdir, factory, branch='',
rsync=False, hour=3, minute=0):
- slavenames = []
+ workernames = []
for slave in master_private.slaves:
if name in slave['builders']:
- slavenames.append(slave['name'])
+ workernames.append(slave['name'])
- if len(slavenames) > 0:
+ if workernames:
f = factory(name, libdir, branch, rsync)
c['builders'].append(BuilderConfig(name=name,
- slavenames=slavenames,
+ workernames=workernames,
factory=f,
- category='blender'))
+ tags=['blender']))
buildernames.append(name)
- schedule_build(name, hour, minute)
+ schedule_nightly_build(name, hour, minute)
schedule_force_build(name)
+
# common steps
-
def git_submodule_step(submodule):
- return Git(name=submodule + '.git',
- repourl='git://git.blender.org/' + submodule + '.git',
- mode='update',
- codebase=submodule,
- workdir=submodule + '.git')
+ return steps.Git(name=submodule + '.git',
+ repourl='git://git.blender.org/' + submodule + '.git',
+ mode='incremental',
+ codebase=submodule,
+ workdir=submodule + '.git')
def git_step(branch=''):
if branch:
- return Git(name='blender.git',
- repourl='git://git.blender.org/blender.git',
- mode='update',
- branch=branch,
- codebase='blender',
- workdir='blender.git',
- submodules=True)
+ return steps.Git(name='blender.git',
+ repourl='git://git.blender.org/blender.git',
+ mode='incremental',
+ branch=branch,
+ codebase='blender',
+ workdir='blender.git',
+ submodules=True)
else:
- return Git(name='blender.git',
- repourl='git://git.blender.org/blender.git',
- mode='update',
- codebase='blender',
- workdir='blender.git',
- submodules=True)
+ return steps.Git(name='blender.git',
+ repourl='git://git.blender.org/blender.git',
+ mode='incremental',
+ codebase='blender',
+ workdir='blender.git',
+ submodules=True)
def git_submodules_update():
@@ -245,12 +270,14 @@ def git_submodules_update():
def lib_svn_step(dir):
- return SVN(name='lib svn',
- baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir,
- codebase='lib svn',
- mode='update',
- defaultBranch='trunk',
- workdir='lib/' + dir)
+ # TODO(sergey): For some reason interpolation is always giving empty branch.
+ # lib_repo = 'https://svn.blender.org/svnroot/bf-blender/%(src::branch)s/lib/'
+ lib_repo = 'https://svn.blender.org/svnroot/bf-blender/trunk/lib/'
+ return steps.SVN(name='lib svn',
+ repourl=util.Interpolate(lib_repo + dir),
+ codebase='lib svn',
+ mode='incremental',
+ workdir='lib/' + dir)
def rsync_step(id, branch, rsync_script):
@@ -260,8 +287,8 @@ def rsync_step(id, branch, rsync_script):
descriptionDone='uploaded',
workdir='install')
-# generic builder
+# generic builder
def generic_builder(id, libdir='', branch='', rsync=False):
filename = 'uploaded/buildbot_upload_' + id + '.zip'
@@ -286,83 +313,106 @@ def generic_builder(id, libdir='', branch='', rsync=False):
f.addStep(Compile(command=['python', compile_script, id], timeout=3600))
f.addStep(Test(command=['python', test_script, id]))
- f.addStep(ShellCommand(name='package',
- command=['python', pack_script, id, branch or Interpolate('%(src:blender:branch)s')],
- description='packaging',
- descriptionDone='packaged'))
+ f.addStep(ShellCommand(
+ name='package',
+ command=['python',
+ pack_script,
+ id,
+ branch or Interpolate('%(src:blender:branch)s')],
+ description='packaging',
+ descriptionDone='packaged'))
if rsync:
f.addStep(rsync_step(id, branch, rsync_script))
else:
f.addStep(FileUpload(name='upload',
- slavesrc='buildbot_upload.zip',
+ workersrc='buildbot_upload.zip',
masterdest=filename,
maxsize=180 * 1024 * 1024,
workdir='install'))
f.addStep(MasterShellCommand(name='unpack',
- command=['python2.7', unpack_script, filename],
+ command=['python2.7',
+ unpack_script,
+ filename],
description='unpacking',
descriptionDone='unpacked'))
return f
+
# Builders
add_builder(c, 'mac_x86_64_10_9_cmake', 'darwin', generic_builder, hour=1)
-add_builder(c, 'linux_glibc219_i686_cmake', '', generic_builder, hour=2)
-add_builder(c, 'linux_glibc219_x86_64_cmake', '', generic_builder, hour=1)
-add_builder(c, 'win32_cmake_vc2013', 'windows_vc12', generic_builder, hour=1)
-add_builder(c, 'win64_cmake_vc2013', 'win64_vc12', generic_builder, hour=2)
-add_builder(c, 'win32_cmake_vc2015', 'windows_vc14', generic_builder, hour=3)
-add_builder(c, 'win64_cmake_vc2015', 'win64_vc14', generic_builder, hour=4)
+add_builder(c, 'linux_glibc224_i686_cmake', '', generic_builder, hour=2)
+add_builder(c, 'linux_glibc224_x86_64_cmake', '', generic_builder, hour=1)
+# NOTE: Visual Studio 2017 (vc15) is using libraries folder from
+# Visual Studio 2015 (vc14)
+add_builder(c, 'win32_cmake_vs2017', 'windows_vc14', generic_builder, hour=1)
+add_builder(c, 'win64_cmake_vs2017', 'win64_vc14', generic_builder, hour=2)
-# STATUS TARGETS
-#
-# 'status' is a list of Status Targets. The results of each build will be
-# pushed to these targets. buildbot/status/*.py has a variety to choose from,
-# including web pages, email senders, and IRC bots.
+# HORIZONS
+from datetime import timedelta
-c['status'] = []
+c['changeHorizon'] = 300
-from buildbot.status import html
-from buildbot.status.web import authz
-from buildbot.status.web import auth
+# Configure a janitor which will delete all logs older than one month,
+# and will run on sundays at noon.
+c['configurators'] = [util.JanitorConfigurator(
+ logHorizon=timedelta(weeks=4),
+ hour=12,
+ dayOfWeek=6)]
-users = []
-for slave in master_private.slaves:
- users += [(slave['name'], slave['password'])]
-authz_cfg = authz.Authz(
- auth=auth.BasicAuth(users),
- # change any of these to True to enable; see the manual for more
- # options
- gracefulShutdown=False,
- forceBuild=True, # use this to test your slave once it is set up
- forceAllBuilds=False,
- pingBuilder=False,
- stopBuild=True,
- stopAllBuilds=False,
- cancelPendingBuild=True,
-)
+# WWW
+c['www'] = dict(port=8010,
+ plugins={'console_view': {},
+ 'grid_view': {},
+ 'waterfall_view': {}})
-c['status'].append(html.WebStatus(http_port=8010, authz=authz_cfg))
-#c['status'].append(html.WebStatus(http_port=8010))
+# Access
+from buildbot.www.authz.roles import RolesFromOwner
+from buildbot.www.authz.roles import RolesFromBase
+
+class StrangerRoles(RolesFromBase):
+ def getRolesFromUser(self, userDetails):
+ return ['stranger']
+
+
+authz = util.Authz(
+ stringsMatcher=util.fnmatchStrMatcher, # simple matcher with '*' glob character
+ # stringsMatcher = util.reStrMatcher, # if you prefer regular expressions
+ allowRules=[
+ # admins can do anything,
+ # defaultDeny=False: if user does not have the admin role, we continue parsing rules
+ util.AnyEndpointMatcher(role="admins", defaultDeny=False),
+
+ # Defaulting old config, everyone can stop build.
+ util.StopBuildEndpointMatcher(role="stranger"),
+ util.ForceBuildEndpointMatcher(role="stranger"),
+ util.RebuildBuildEndpointMatcher(role="stranger"),
+ util.EnableSchedulerEndpointMatcher(role="admins"),
+
+ # if future Buildbot implement new control, we are safe with this last rule
+ # NOTE: This prevents us from cancelling queue, so disabled for now.
+ # util.AnyControlEndpointMatcher(role="admins")
+ ],
+ roleMatchers=[
+ RolesFromOwner(role="owner"),
+ StrangerRoles(),
+ ])
+c['www']['authz'] = authz
# PROJECT IDENTITY
-
c['projectName'] = "Blender"
-c['projectURL'] = "http://www.blender.org"
+c['projectURL'] = "https://www.blender.org"
-# the 'buildbotURL' string should point to the location where the buildbot's
-# internal web server (usually the html.WebStatus page) is visible. This
-# typically uses the port number set in the Waterfall 'status' entry, but
-# with an externally-visible host name which the buildbot cannot figure out
-# without some help.
-
-c['buildbotURL'] = "http://builder.blender.org/"
-
-# DB URL
-#
-# This specifies what database buildbot uses to store change and scheduler
-# state. You can leave this at its default for all but the largest
-# installations.
+# Buildbot information
+c['buildbotURL'] = "https://builder.blender.org/admin/"
+c['buildbotNetUsageData'] = 'basic'
+# Various
c['db_url'] = "sqlite:///state.sqlite"
+
+c['title'] = "Blender"
+c['titleURL'] = "https://builder.blender.org/"
+
+# Disable sending of 'buildbotNetUsageData' for now, to improve startup time.
+c['buildbotNetUsageData'] = None
diff --git a/master_unpack.py b/master_unpack.py
index 61c6309..394a101 100644
--- a/master_unpack.py
+++ b/master_unpack.py
@@ -119,12 +119,13 @@ if platform == '':
sys.exit(1)
# extract
+download_prefix = "/data/www/vhosts/builder.blender.org/webroot/download/"
if not branch or branch == 'master':
- directory = 'public_html/download'
+ directory = download_prefix
elif branch == 'experimental-build':
- directory = 'public_html/download/experimental'
+ directory = os.path.join(download_prefix, "experimental")
else:
- directory = 'public_html/download'
+ directory = download_prefix
try:
filename = os.path.join(directory, packagename)
diff --git a/package.json b/package.json
deleted file mode 100644
index 66507d8..0000000
--- a/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "name": "blender-buildbot",
- "repository": {
- "type": "git",
- "url": "git://git.blender.org/blender-buildbot.git"
- },
- "author": "Blender Foundation",
- "license": "GPL",
- "devDependencies": {
- "grunt": "^0.4.5",
- "grunt-autoprefixer": "^1.0.1",
- "grunt-contrib-sass": "^0.8.1",
- "grunt-contrib-watch": "~0.6.1"
- }
-}
diff --git a/public_html/assets/css/main.css b/public_html/assets/css/main.css
deleted file mode 100644
index 805bcab..0000000
--- a/public_html/assets/css/main.css
+++ /dev/null
@@ -1,19 +0,0 @@
-@import url(//fonts.googleapis.com/css?family=Open+Sans);@import url(//fonts.googleapis.com/css?family=Open+Sans+Condensed:300);@import url(../../assets_shared/css/font-borg.css);/*!
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see
-
-
-
-{% if not b.isFinished() %}
-
Build In Progress:
-
- {% if when_time %}
-
ETA: {{ when_time }} [{{ when }}]
- {% endif %}
-
- {{ current_step }}
-
- {% if authz.advertiseAction('stopBuild', request) %}
-
Stop Build
- {{ forms.stop_build(build_url+"/stop", authz, on_all=False, short=False, label='This Build') }}
- {% endif %}
-{% else %}
-
Results:
-
-
-
- {{ b.getText()|join(' ')|capitalize }}
-
-
-
- {% if b.getTestResults() %}
-
- {% endif %}
-{% endif %}
-
-
-{% if sourcestamps|count == 1 %}
-SourceStamp:
-{% else %}
-SourceStamps:
-{% endif %}
-
-
-{% for sourcestamps_row in sourcestamps | batch(3, ' ') %}
-
-{% for ss in sourcestamps_row %}
-
-
-
{{ ss }}
-
- {% set ss_class = cycler('alt','') %}
-
- {% if ss.project %}
- Project {{ ss.project|projectlink }} Repository {{ ss.repository|repolink }} Branch {{ ss.branch|e }} Revision {{ ss.revision|revlink(ss.repository) }} Got Revision {{ got_revisions[ss.codebase]|revlink(ss.repository) }} Patch YES Changes {{ ss.changes|count }} change{{ 's' if ss.changes|count > 1 else '' }} Build of most recent revision
-
-{% endfor %}
-
-{% endfor %}
-
-{#
- # TODO: turn this into a table, or some other sort of definition-list
- # that doesn't take up quite so much vertical space
- #}
-
-
BuildSlave:
-
-{% if slave_url %}
-
{{ b.getSlavename()|e }}
-{% else %}
- {{ b.getSlavename()|e }}
-{% endif %}
-
-
Reason:
-
-{{ b.getReason()|e }}
-
-
-
Steps and Logfiles:
-
-{#
- # TODO:
- # urls = self.original.getURLs()
- # ex_url_class = "BuildStep external"
- # for name, target in urls.items():
- # text.append('[
%s ]' %
- # (target, ex_url_class, html.escape(name)))
- #}
-
-{# TODO(sergey): Move hardcoded span with inline-block into a CSS class. #}
-
-
-{% for s in steps %}
-
- {{ s.name }}
- {{ s.text }} {{ '( ' + s.time_to_run + ' )' if s.time_to_run else '' }}
-
-
-
- {% set item_class = cycler('alt', '') %}
- {% for l in s.logs %}
- {{ l.name }}
- {% else %}
- - no logs -
- {% endfor %}
- {% for u in s.urls %}
- {{ u.logname }}
- {% endfor %}
-
-
-
-{% endfor %}
-
-
-
-
-
Build Properties:
-
-
-Name Value Source
- {{ p.name|e }}
- {% if p.short_value %}
- {{ p.short_value|e }} .. [property value too long]
- {% else %}
- {% if p.value is not mapping %}
- {{ p.value|e }}
- {% else %}
-
-
- {%- for key, value in p.value.items() recursive %}
- {{ key|e }} {{ value|e }}
-
- {% endif %}
- {% endif %}
- {{ p.source|e }}
-
-{% endif %}
-{% endfor %}
-
-
Forced Build Properties:
-
-Name Label Value
- {{ p.name|e }}
-
- {% if p.label %}
- {{ p.label }}
- {% endif %}
-
- {% if p.text %}
- {{ p.value|e }}
- {% endif %}
-
- {% endif %}
-{% endfor %}
-
-
-
Responsible Users:
-
-{% if responsible_users %}
-
- {% for u in responsible_users %}
- {{ u|user }}
- {% endfor %}
-
-{% else %}
-
no responsible users
-{% endif %}
-
-
-
Timing:
-
- Start {{ start }} End {{ end }} Elapsed {{ elapsed }}
-
- {% if authz.advertiseAction('forceBuild', request) %}
-
Resubmit Build:
- {{ forms.rebuild_build(build_url+"/rebuild", authz, sourcestamps[0]) }}
- {% endif %}
-
-
-
All Changes:
- {% for ss in sourcestamps %}
- {% if ss.changes %}
-
{{ ss.codebase }}:
-
- {% for c in ss.changes %}
- Change #{{ c.number }}
- {{ change(c.asDict()) }}
-
- {% endif %}
- {% endfor %}
-
({{ b.time }})
- Rev: {% if b.multiple_revs -%}
- multiple rev
- {%- else -%}
- {{ b.rev_list[0]['rev']|shortrev(b.rev_list[0]['repo']) }}
- {%- endif %}
- {{ b.results }}
- {% if include_builder %}
- {{ b.builder_name }}
- {% endif %}
- #{{ b.buildnum }} -
- {{ b.text|capitalize }}
-{% endmacro %}
-
-{% macro build_tr(b, include_builder=False, loop=None) %}
-
- {{ b.time }} {%- for rev in b.rev_list -%}
- {%- if not loop.first %}{{ rev['codebase'] }} : {% endif -%}
- {{ rev['rev']|shortrev(rev['repo']) }}
- {%- endfor -%}
-
- {{ b.results }} {{ b.builder_name }} #{{ b.buildnum }} {{ b.reason|e }}
- {%- for user in (b.interested_users or []) -%}
- {%- if not loop.first %}, {% endif -%}
- {{ user|e }}
- {%- endfor -%}
- {{ b.text|capitalize }}
-{% endmacro %}
-
-{% macro build_table(builds, include_builder=False) %}
-{% if builds %}
-
-
- Time
- Revision
- Result
- {%- if include_builder %}
- Builder
- {% endif %}
- Build #
- Reason
- Info
-
- {% for b in builds %}
- {{ build_tr(b, include_builder, loop) }}
- {% endfor %}
-
-{% else %}
- No matching builds found
-{% endif %}
-{% endmacro %}
diff --git a/templates/builder.html b/templates/builder.html
deleted file mode 100644
index e9e2e16..0000000
--- a/templates/builder.html
+++ /dev/null
@@ -1,124 +0,0 @@
-{% from 'build_line.html' import build_table %}
-{% import 'forms.html' as forms %}
-
-{% extends "layout.html" %}
-{% block content %}
-
-Builder {{ name }}
-
-(view in waterfall )
-
-{% if description %}
- {{ description }}
-{% endif %}
-
-
-
-{% if current %}
-
Current Builds:
-
- {% for b in current %}
- {{ b.num }}
- {% if b.when %}
- ETA: {{ b.when_time }} [{{ b.when }}]
- {% endif %}
-
- {{ b.current_step }}
-
- {% if authz.advertiseAction('stopBuild', request) %}
- {{ forms.stop_build(b.stop_url, authz, on_all=False, short=True, label='Build') }}
- {% endif %}
-
-{% else %}
-
No current builds
-{% endif %}
-
-{% if pending %}
-
Pending build requests:
-
- {% for b in pending %}
- ({{ b.when }}, waiting {{ b.delay }})
-
- {% if authz.advertiseAction('cancelPendingBuild', request) %}
- {{ forms.cancel_pending_build(builder_url+"/cancelbuild", authz, short=True, id=b.id) }}
- {% endif %}
-
- {% if b.num_changes < 4 %}
- {% for c in b.changes %}{{ c.revision|shortrev(c.repo) }}
- ({{ c.who|email }} ){% if not loop.last %},{% endif %}
- {% endfor %}
- {% else %}
- ({{ b.num_changes }} changes)
- {% endif %}
-
- {% if 'owner' in b.properties %}
- Forced build
- by {{b.properties['owner'][0]}}
- {% if 'reason' in b.properties %}
- {{b.properties['reason'][0]}}
- {% endif %}
- {% endif %}
-
-
- {% if authz.advertiseAction('cancelPendingBuild', request) %}
- {{ forms.cancel_pending_build(builder_url+"/cancelbuild", authz, short=False, id='all') }}
- {% endif %}
-
-{% else %}
-
No pending build requests
-{% endif %}
-
-
Recent builds:
-
-{{ build_table(recent) }}
-
-
Show more
-
-
-
-
Buildslaves:
-
-{% if slaves %}
-
- Name
- Status
- Admin
-
-{% endif %}
-{% for s in slaves %}
-
- {{ s.name|e }} paused
- {% else %}
- connected
- {% endif %}
- {% else %}
- offline
- {% endif %}
- {{ s.admin|email if s.admin else ""}}
-
-{% else %}
- no slaves attached
-{% endfor %}
-
-
-{% if authz.advertiseAction('pingBuilder', request) %}
-
Ping slaves
- {{ forms.ping_builder(builder_url+"/ping", authz) }}
-{% endif %}
-
-{% if authz.advertiseAction('forceBuild', request) and force_schedulers != {} %}
-
Force build
- {{ forms.force_build(builder_url+"/force", authz, request, False, force_schedulers=force_schedulers,default_props=default_props) }}
-{% endif %}
-
-
Builders: {{ branches|join(', ')|e }}
-
-
-{% for b in builders %}
-
- {{ b.name|e }}
- {{ b.build_label }}
-
- {% else %}
- no build
- {% endif %}
- {# Sybren: The following removes the last 'next in', because it's always duplicated,
- # and removes some newlines (box() adds a
-{% endfor %}
-
-
-{% if num_building > 0 %}
- {% if authz.advertiseAction('stopAllBuilds', request) or authz.advertiseAction('stopBuild', request) %}
- Stop selected builds
- {{ forms.stop_build(path_to_root+"builders/_selected/stopselected", authz, on_selected=True, builders=builders, label='Selected Builds') }}
- Stop all builds
- {{ forms.stop_build(path_to_root+"builders/_all/stopall", authz, on_all=True, label='All Builds') }}
- {% endif %}
-{% endif %}
-
-{% if authz.advertiseAction('cancelAllPendingBuilds', request) %}
- Cancel selected pending builds
- {{ forms.cancel_build(path_to_root+"builders/_selected/cancelpendingselected", authz, on_selected=True, builders=builders, label='Selected Pending Builds') }}
- Cancel All Pending Builds
- {{ forms.cancel_build(path_to_root+"builders/_all/cancelpendingall", authz, on_all=True, label='All Pending Builds') }}
-{% endif %}
-
-{% if num_online > 0 %}
- {% if authz.advertiseAction('forceAllBuilds', request) or authz.advertiseAction('forceBuild', request) %}
- Force selected builds
- {{ forms.force_build(path_to_root+"builders/_selected/forceselected", authz, request, on_selected=True, builders=builders, force_schedulers=force_schedulers, default_props=default_props) }}
- Force all builds
- {{ forms.force_build(path_to_root+"builders/_all/forceall", authz,request, on_all=True, force_schedulers=force_schedulers, default_props=default_props) }}
- {% endif %}
-{% endif %}
-
-{% endblock %}
diff --git a/templates/buildslave.html b/templates/buildslave.html
deleted file mode 100644
index c53cab0..0000000
--- a/templates/buildslave.html
+++ /dev/null
@@ -1,94 +0,0 @@
-{% from 'build_line.html' import build_table, build_line %}
-{% import 'forms.html' as forms %}
-
-{% extends "layout.html" %}
-{% block content %}
-Buildslave: {{ slavename|e }}
-
-
-
-{% if current %}
-
Currently building:
-
- {% for b in current %}
- {{ build_line(b, True) }}
-
-
- {% endfor %}
-
-{% else %}
-
No current builds
-{% endif %}
-
-
Recent builds
-{{ build_table(recent, True) }}
-
-
-{% if access_uri %}
-
Click to Access Slave
-{% endif %}
-
-{% if admin %}
-
Administrator
-
{{ admin|email }}
-{% endif %}
-
-{% if host or info %}
-
Slave information
-
-{% if host %}
- Buildbot-Slave {{ slave_version }}
-
-{% endif %}
-
-{% if info %}
-
-Name Value
- {{ info_name|e }}
- {% if info_val is not mapping %}
- {{ info_val|e }}
- {% else %}
-
-
- {%- for key, value in info_val.items() recursive %}
- {{ key|e }} {{ value|e }}
-
- {% endif %}
-
-{% endfor %}
-
-{% endif %}
-{% endif %}
-
-
Connection Status
-
-{{ connect_count }} connection(s) in the last hour
-{% if not slave.isConnected() %}
-(not currently connected)
-{% else %}
-
- {% if authz.advertiseAction('gracefulShutdown', request) %}
-
Graceful Shutdown
- {% if slave.getGraceful() %}
-
Slave will shut down gracefully when it is idle.
- {% else %}
- {{ forms.graceful_shutdown(shutdown_url, authz) }}
- {% endif %}
- {% endif %}
- {% if authz.advertiseAction('pauseSlave', request) %}
-
Pause Slave
- {{ forms.pause_slave(pause_url, authz, slave.isPaused()) }}
- {% endif %}
-{% endif %}
-
Buildslaves
-
-
-
-
-
-
- Name
- {%- if show_builder_column %}
- Builders
- {%- endif %}
- BuildBot
- Admin
- Last heard from
- Connects/Hour
- Status
-
-
-{% for s in slaves %}
-
- {{ s.name }}
- {%- if s.builders %}
- {%- for b in s.builders %}
- {{ b.name }}
- {%- endfor %}
- {%- else %}
- no builders
- {%- endif -%}
-
- {%- endif %}
-
-
- {{ (s.version or '-')|e }}
-
- {%- if s.admin -%}
- {{ s.admin|email }}
- {%- else -%}
- -
- {%- endif -%}
-
-
- {%- if s.last_heard_from_age -%}
- {{ s.last_heard_from_age }} ({{ s.last_heard_from_time }})
- {%- endif -%}
-
-
- {{ s.connectCount }}
-
-
- {% if s.connected %}
- {% if s.running_builds %}
- Running {{ s.running_builds }} build(s)
- {% elif s.paused %}
- Paused
- {% else %}
- Idle
- {% endif %}
-
- {% else %}
-
-{% endfor %}
-
-
-
Directory listing for {{ path }}
-{% else %}
-Download Latest Builds
-
-If you are interested to help developers improve an area of Blender you are experienced, mail bf-committers .
-
-
-
-
-
They contain highly experimental patches, which might ruin your day!
-
If you're NOT a developer, please leave this page IMMEDIATELY!
-
-
-
-Operating System
-Variation
-Name
-Size
-Built On
-
-
-{% for d in directories %}
- {% if not ("experimental" in d,text) %}
-
- {{ d.text }} {{ d.size }} {{ d.lastmodified }}
-
- {% endif %}
-{% endfor %}
-
-{% for f in files|sort %}
- {% if ("mingw" in f.text) or ("vc1" in f.text) or ("blender-2.8" in f.text) or ("experimental" in f.text) %}
- {% else %}
-
- {% if "mingw32" in f.text %}
-
- Official
-
-
- {{ f.text }} {{ f.size }}
-
- {{ f.lastmodified }}
-
-
- {% endif %}
-{% endfor %}
-
-{% for f in files|sort %}
-{% if ("experimental" in f.text) %}
-
- {% if "mingw32" in f.text %}
- Experimental Build Branch
- {{ f.text }} {{ f.size }}
- {{ f.lastmodified }}
-
-{% endif %}
-{% endfor %}
-
-
-
-
-
-
-
- {% if "mingw32" in f.text %}
-
- {% if "mingw" in f.text %}
- Experimental MinGW
- {% elif "vc14" in f.text %}
- Experimental Build Branch by VS 2015(Windows Vista/7/8/10)
- {% else %}
- Official
- {% endif %}
-
-
- {{ f.text }} {{ f.size }}
- {{ f.lastmodified }}
-
- {% endif %}
-{% endfor %}
-
-
-
-
-Currently we are aware of many issues in 2.8 and actively working to fix them.module team members
-
-
-
-
- {% if "mingw32" in f.text %}
-
- {% if "mingw" in f.text %}
- Experimental MinGW
- {% elif "vc14" in f.text %}
- {% if "blender-2.8" in f.text %}
- Blender 2.8 Branch by VS 2015(Windows Vista/7/8/10)
- {% else %}
- Experimental VS 2015(Windows Vista/7/8/10)
- {% endif %}
- {% elif "win32-vc12" in f.text %}
- Official Preview VS 2013(Windows XP/Vista/7/8/10)
- {% elif "win64-vc12" in f.text %}
- Official Preview VS 2013(Windows Vista/7/8/10)
- {% elif "blender-2.8" in f.text %}
- Blender 2.8 Branch
- {% else %}
- Official
- {% endif %}
-
-
- {{ f.text }} {{ f.size }}
- {{ f.lastmodified }}
-
- {% endif %}
-{% endfor %}
-
-
-
-{% endblock %}
diff --git a/templates/forms.html b/templates/forms.html
deleted file mode 100644
index d59a7af..0000000
--- a/templates/forms.html
+++ /dev/null
@@ -1,283 +0,0 @@
-
-{% macro cancel_pending_build(cancel_url, authz, short=False, id='all') %}
-
-{% endmacro %}
-
-{% macro stop_change_builds(stopchange_url, changenum, authz) %}
- {% if not changenum %}
-
- {% endif %}
-{% endmacro %}
-
-{% macro stop_build(stop_url, authz, on_all=False, on_selected=False, builders=[], short=False, label="Build") %}
- {% if not short %}
-
- {% endif %}
-{% endmacro %}
-
-{% macro cancel_build(cancel_url, authz, on_all=False, on_selected=False, builders=[], short=False, label="Build") %}
- {% if not short %}
-
- {% endif %}
-{% endmacro %}
-
-{# TODO(sergey): Move hardcoded span with inline-block into a CSS class. #}
-
-{% macro force_build_scheduler_parameter(f, authz, request, sch, default_props) %}
- {% if f and not f.hide and (f.fullName != "username" or not authz.authenticated(request)) %}
-
- {% endif %}
-{% endmacro %}
-
-{% macro force_build_one_scheduler(force_url, authz, request, on_all, on_selected, builders, sch, default_props) %}
-
-{% endmacro %}
-{% macro force_build(force_url, authz, request, on_all=False, on_selected=False, builders=[], force_schedulers={},default_props={}) %}
-
- {% for name, sch in force_schedulers.items() | sort %}
- {{ force_build_one_scheduler(force_url, authz, request, on_all, on_selected, builders, sch, default_props=default_props) }}
- {% endfor %}
-
-{% endmacro %}
-
-{% macro graceful_shutdown(shutdown_url, authz) %}
-
-{% endmacro %}
-
-{% macro pause_slave(pause_url, authz, paused) %}
-
-{% endmacro %}
-
-{% macro clean_shutdown(shutdown_url, authz) %}
-
-{% endmacro %}
-
-{% macro cancel_clean_shutdown(cancel_shutdown_url, authz) %}
-
-{% endmacro %}
-
-{% macro ping_builder(ping_url, authz) %}
-
-{% endmacro %}
-
-{% macro rebuild_build(rebuild_url, authz, ss) %}
-
-{% endmacro %}
-
-{% macro show_users(users_url, authz) %}
-
-{% endmacro %}
diff --git a/templates/grid.html b/templates/grid.html
deleted file mode 100644
index 2540fde..0000000
--- a/templates/grid.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{% extends "layout.html" %}
-{% import 'grid_macros.html' as grid with context %}
-
-{% block content %}
-
-Grid View
-
-
-
-
- {{ title }}
- {{ grid.tag_title() }}
-
-
-{% for builder in builders %}
-
- {{ grid.builder_td(builder) }}
- {% for build in builder.builds %}
- {{ grid.build_td(build) }}
- {% endfor %}
-
-{% endfor %}
-
-
-
-{% endblock %}
diff --git a/templates/grid_transposed.html b/templates/grid_transposed.html
deleted file mode 100644
index 5e48d5e..0000000
--- a/templates/grid_transposed.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% extends "layout.html" %}
-{% import 'grid_macros.html' as grid with context %}
-
-{% block content %}
-
-Transposed Grid View
-
-
-
-
- {{ title }}
- {{ grid.tag_title() }}
-
-
-{% for i in range %}
-
- {{ grid.stamp_td(stamps[i]) }}
- {% for b in builder_builds %}
- {{ grid.build_td(b[i]) }}
- {% endfor %}
-
-{% endfor %}
-
-
-
-{% endblock %}
diff --git a/templates/layout.html b/templates/layout.html
deleted file mode 100644
index 66bfd88..0000000
--- a/templates/layout.html
+++ /dev/null
@@ -1,205 +0,0 @@
-{%- block doctype -%}
-
-{% endblock %}
-
-
- {% block head %}
- {{ title|e }}
-
-
-
-
-
-
-
- {% set title = request.path.split("/")[1] %}
-
-
-
-
-
-
-
-
-
-
-
- {% endblock %}
-
- {%- block barecontent -%}
-
-
-
- {%- block content -%}
- {%- endblock -%}
-
-
-
- {%- endblock -%}
-
-
-
- BuildBot ({{version}}) - Page built: {{ time }} ({{ tz }})
- {% if project_name -%}
- working for the
- {%- if project_url -%}
- {{ project_name }}
- {%- else -%}
- {{ project_name }}
- {%- endif -%}
- project.
- {%- endif -%}
-
-
- Blender.org
-
-
-
-
- {% endblock -%}
-
-
-
-
diff --git a/templates/root.html b/templates/root.html
deleted file mode 100644
index d352206..0000000
--- a/templates/root.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends 'layout.html' %}
-{% import 'forms.html' as forms %}
-
-{% block content %}
-
-Blender Buildbot
-
-
-
-{% endblock %}
-
diff --git a/templates/waterfall.html b/templates/waterfall.html
deleted file mode 100644
index d8738db..0000000
--- a/templates/waterfall.html
+++ /dev/null
@@ -1,66 +0,0 @@
-{% extends "layout.html" %}
-{% from "box_macros.html" import box %}
-
-{% block content %}
-
-
-
-
-
-
-
- last build
-
-
-{% for b in builders %}
-
- {{ b.name }}
-{% endfor %}
-
-
-
-current activity
-
-{% for b in builders %}
-
- {{ "
-{% endfor %}
-
-
-
-{{ tz }}
-changes {{ b.name }}
-
-{# waterfall contents goes here #}
-{% for i in range(gridlen) -%}
-
- {% for strip in grid -%}
- {%- if strip[i] -%}{{ box(**strip[i]) }}
- {%- elif no_bubble -%}{{ box() }}
- {%- endif -%}
- {%- endfor -%}
-
-{% endfor %}
-
-
-
-{% if nextpage %}
- next page
-{% endif %}
-
-{% if no_reload_page %}
- Stop Reloading
-{% endif %}
-
-{% endblock %}