[Bf-blender-cvs] [e24dee435e2] master: Buildbot: Remove master configuration files
Sergey Sharybin
noreply at git.blender.org
Fri Feb 23 12:39:11 CET 2018
Commit: e24dee435e263cfc7e6265eb3c8f3350a5d7f781
Author: Sergey Sharybin
Date: Fri Feb 23 12:37:05 2018 +0100
Branches: master
https://developer.blender.org/rBe24dee435e263cfc7e6265eb3c8f3350a5d7f781
Buildbot: Remove master configuration files
Those are stored in blender-buildbot repository now, so having them in
Blender only causes extra work to keep files in sync.
===================================================================
D build_files/buildbot/master.cfg
D build_files/buildbot/master_unpack.py
===================================================================
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg
deleted file mode 100644
index e3101430e50..00000000000
--- a/build_files/buildbot/master.cfg
+++ /dev/null
@@ -1,368 +0,0 @@
-# -*- python -*-
-# ex: set syntax=python:
-
-# <pep8 compliant>
-
-# List of the branches being built automatically overnight
-NIGHT_SCHEDULE_BRANCHES = [None, "blender2.8"]
-
-# List of the branches available for force build
-FORCE_SCHEDULE_BRANCHES = ["master", "blender2.8", "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
-:)
-"""
-
-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
-
-# Dictionary that the buildmaster pays attention to.
-c = BuildmasterConfig = {}
-
-# BUILD SLAVES
-#
-# We load the slaves and their passwords from a separator file, so we can have
-# this one in SVN.
-
-from buildbot.buildslave import BuildSlave
-import master_private
-
-c['slaves'] = []
-
-for slave in master_private.slaves:
- c['slaves'].append(BuildSlave(slave['name'], slave['password']))
-
-# TCP port through which slaves connect
-
-c['slavePortnum'] = 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)
-
-
-# CODEBASES
-#
-# Allow to control separately things like branches for each repo and submodules.
-
-all_repositories = {
- r'git://git.blender.org/blender.git': 'blender',
- r'git://git.blender.org/blender-translations.git': 'blender-translations',
- r'git://git.blender.org/blender-addons.git': 'blender-addons',
- r'git://git.blender.org/blender-addons-contrib.git': 'blender-addons-contrib',
- r'git://git.blender.org/blender-dev-tools.git': 'blender-dev-tools',
- r'https://svn.blender.org/svnroot/bf-blender/': 'lib svn',
-}
-
-
-def codebaseGenerator(chdict):
- return all_repositories[chdict['repository']]
-
-c['codebaseGenerator'] = codebaseGenerator
-
-
-# SCHEDULERS
-#
-# 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,
- builderNames=[name],
- codebases=[forcesched.CodebaseParameter(
- codebase="blender",
- branch=forcesched.ChoiceStringParameter(
- 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.8"], 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")],
- properties=[]))
-
-
-def schedule_build(name, hour, minute=0):
- for current_branch in NIGHT_SCHEDULE_BRANCHES:
- scheduler_name = "nightly " + name
- if current_branch:
- scheduler_name += ' ' + current_branch
- # Use special addons submodule branch when building blender2.8 branch.
- addons_branch = "master"
- if current_branch == "blender2.8":
- addons_branch = "blender2.8"
- 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"}},
- branch=current_branch,
- builderNames=[name],
- hour=hour,
- minute=minute))
-
-
-# BUILDERS
-#
-# The 'builders' list defines the Builders, which tell Buildbot how to
-# 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.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
-
-c['builders'] = []
-buildernames = []
-
-
-def add_builder(c, name, libdir, factory, branch='',
- rsync=False, hour=3, minute=0):
- slavenames = []
-
- for slave in master_private.slaves:
- if name in slave['builders']:
- slavenames.append(slave['name'])
-
- if len(slavenames) > 0:
- f = factory(name, libdir, branch, rsync)
- c['builders'].append(BuilderConfig(name=name,
- slavenames=slavenames,
- factory=f,
- category='blender'))
- buildernames.append(name)
-
- schedule_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')
-
-
-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)
- else:
- return Git(name='blender.git',
- repourl='git://git.blender.org/blender.git',
- mode='update',
- codebase='blender',
- workdir='blender.git',
- submodules=True)
-
-
-def git_submodules_update():
- command = ['git', 'submodule', 'update', '--remote']
- return ShellCommand(name='Submodules Update',
- command=command,
- description='updating',
- descriptionDone='up to date',
- workdir='blender.git')
-
-
-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)
-
-
-def rsync_step(id, branch, rsync_script):
- return ShellCommand(name='rsync',
- command=['python', rsync_script, id, branch],
- description='uploading',
- descriptionDone='uploaded',
- workdir='install')
-
-# generic builder
-
-
-def generic_builder(id, libdir='', branch='', rsync=False):
- filename = 'uploaded/buildbot_upload_' + id + '.zip'
- compile_script = '../blender.git/build_files/buildbot/slave_compile.py'
- test_script = '../blender.git/build_files/buildbot/slave_test.py'
- pack_script = '../blender.git/build_files/buildbot/slave_pack.py'
- rsync_script = '../blender.git/build_files/buildbot/slave_rsync.py'
- unpack_script = 'master_unpack.p
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list