[gentoo-commits] proj/tinderbox-cluster:master commit in: /

[gentoo-commits] proj/tinderbox-cluster:master commit in: /

[Magnus Granberg]

commit:     7792701f588d7c92c019de3924fbdad1d9a8014d
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  9 06:05:07 2020 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 06:05:07 2020 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=7792701f

Remove timestamp and deleted on tables keyword, use and restrictions

Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org>

 gosbs/db/sqlalchemy/models.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --cc gosbs/db/sqlalchemy/models.py
index 119369c,e4fc530..1c2db00
--- a/gosbs/db/sqlalchemy/models.py
+++ b/gosbs/db/sqlalchemy/models.py
@@@ -15,8 -15,12 +15,17 @@@
  #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  #    License for the specific language governing permissions and limitations
  #    under the License.
++<<<<<<< HEAD
 +"""
 +SQLAlchemy models for nova data.
++=======
+ 
+ # Origin https://github.com/openstack/nova/blob/master/nova/db/sqlalchemy/models.py
+ # Only small part is left from the origin
+ 
+ """
+ SQLAlchemy models for gosbs data.
++>>>>>>> be80f7418991180567f0882902ca4151a635e42d
  """
  
  import uuid
@@@ -274,7 -278,7 +283,11 @@@ class PackagesEmails(BASE, NovaBase)
                  default=lambda: str(uuid.uuid4()))
      email_id = Column(Integer, ForeignKey('emails.id'))
  
++<<<<<<< HEAD
 +class Emails(BASE, NovaBase):
++=======
+ class Emails(BASE, NovaBase, models.TimestampMixin, models.SoftDeleteMixin):
++>>>>>>> be80f7418991180567f0882902ca4151a635e42d
      """Represents an image in the datastore."""
      __tablename__ = 'emails'
      __table_args__ = (
@@@ -282,7 -286,7 +295,11 @@@
      id = Column(Integer, primary_key=True)
      email = Column(String(255))
  
++<<<<<<< HEAD
 +class Uses(BASE, NovaBase):
++=======
+ class Uses(BASE, NovaBase, models.TimestampMixin, models.SoftDeleteMixin):
++>>>>>>> be80f7418991180567f0882902ca4151a635e42d
      """Represents an image in the datastore."""
      __tablename__ = 'uses'
      __table_args__ = (
@@@ -292,7 -296,7 +309,11 @@@
      flag = Column(String(255))
      description = Column(Text)
  
++<<<<<<< HEAD
 +class Restrictions(BASE, NovaBase):
++=======
+ class Restrictions(BASE, NovaBase, models.TimestampMixin, models.SoftDeleteMixin):
++>>>>>>> be80f7418991180567f0882902ca4151a635e42d
      """Represents an image in the datastore."""
      __tablename__ = 'restrictions'
      __table_args__ = (
@@@ -301,7 -305,7 +322,11 @@@
      id = Column(Integer, primary_key=True)
      restriction = Column(String(255))
      
++<<<<<<< HEAD
 +class Keywords(BASE, NovaBase):
++=======
+ class Keywords(BASE, NovaBase, models.TimestampMixin, models.SoftDeleteMixin):
++>>>>>>> be80f7418991180567f0882902ca4151a635e42d
      """Represents an image in the datastore."""
      __tablename__ = 'keywords'
      __table_args__ = (

[gentoo-commits] proj/tinderbox-cluster:master commit in: /

[Magnus Granberg]

commit:     fb8fd7f92f69ebd16a9164ddd8a8328c7c6a7f16
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 28 21:07:47 2021 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Thu Oct 28 21:07:47 2021 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=fb8fd7f9

Update the cfg files (worker_data, project)

Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org>

 gentooci.cfg | 26 +++++++++++++++++++++++---
 master.cfg   | 42 ++++++++++++++++++++++++++++++++----------
 2 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/gentooci.cfg b/gentooci.cfg
index 4043db4..3701878 100644
--- a/gentooci.cfg
+++ b/gentooci.cfg
@@ -13,10 +13,30 @@ c = BuildmasterConfig = {}
 # It's easy to start with sqlite, but it's recommended to switch to a dedicated
 # database, such as PostgreSQL or MySQL, for use in production environments.
 # http://docs.buildbot.net/current/manual/configuration/global.html#database-specification
-c['db_url'] = "mysql://buildbot:xxxx@192.168.1.x/gentooci?max_idle=300"
+c['db_url'] = "postgresql://buildbot:password@ip/gentoo-ci"
+
+makeconf_list = []
+makeconf_list.append('LC_MESSAGES=C')
+makeconf_list.append('NOCOLOR="true"')
+makeconf_list.append('GCC_COLORS=""')
+makeconf_list.append('PORTAGE_TMPFS="/dev/shm"')
+makeconf_list.append('CLEAN_DELAY=0')
+makeconf_list.append('NOCOLOR=true')
+makeconf_list.append('PORT_LOGDIR="/var/cache/portage/logs"')
+makeconf_list.append('PKGDIR="/var/cache/portage/packages"')
+makeconf_list.append('DISTDIR="/var/cache/portage/distfiles"')
+makeconf_list.append('PORTAGE_ELOG_CLASSES="*"')
+# We need echo:info to get the logfile name
+makeconf_list.append('PORTAGE_ELOG_SYSTEM="save:* echo:info"')
+# use ansifilter on the logs
+makeconf_list.append('PORTAGE_LOG_FILTER_FILE_CMD="bash -c \'ansifilter --ignore-clear; exec cat\'"')
 
 # This specifies what project buildbot uses for Gentoo Ci as default
-c['project'] = "gosbsbase"
+c['project'] = {
+    'update_db' : 'gosbsbase',
+    'worker_portage_repos_path' : '/var/db/repos/',
+    'config_makeconfig' : makeconf_list,
+}
 
 # This specifies what the repository base dir is
-c['repository_basedir'] = "/srv/repository"
+c['repository_basedir'] = "repositorys"

diff --git a/master.cfg b/master.cfg
index 464d54d..47555ce 100644
--- a/master.cfg
+++ b/master.cfg
@@ -1,20 +1,33 @@
 # -*- python -*-
 # ex: set filetype=python:
-from buildbot_gentoo_ci.config import schedulers, workers, builders, service
+from buildbot.plugins import util
+from buildbot_gentoo_ci.config import schedulers, workers, builders, service, change_source, reporters
 
 # This is a sample buildmaster config file. It must be installed as
 # 'master.cfg' in your buildmaster's base directory.
 
+#FIXME: Get workers from db or a file
+worker_data = [
+    {'uuid' : 'uuid', 'password' : '', 'type' : 'local', 'enable' : True, },
+    {'uuid' : 'uuid', 'password' : '', 'type' : 'local', 'enable' : True, },
+    {'uuid' : 'uuid', 'password' : '', 'type' : 'local', 'enable' : True, },
+    {'uuid' : 'uuid', 'password' : '', 'type' : 'local', 'enable' : True, },
+    {'uuid' : 'uuid', 'password' : 'password', 'type' : 'default', 'enable' : True, },
+    {'uuid' : 'uuid', 'password' : 'password', 'type' : 'default', 'enable' : True, },
+]
+
 # This is the dictionary that the buildmaster pays attention to. We also use
 # a shorter alias to save typing.
 c = BuildmasterConfig = {}
 
+c['buildbotNetUsageData'] = None
+
 ####### WORKERS
 
 # The 'workers' list defines the set of recognized workers. Each element is
 # a Worker object, specifying a unique worker name and password.  The same
 # worker name and password must be configured on the worker.
-c['workers'] = workers.gentoo_workers()
+c['workers'] = workers.gentoo_workers(worker_data)
 
 # 'protocols' contains information about protocols which master will use for
 # communicating with workers. You must define at least 'port' option that workers
@@ -28,7 +41,7 @@ c['protocols'] = {'pb': {'port': 9989}}
 # the 'change_source' setting tells the buildmaster how it should find out
 # about source code changes.  Here we point to the buildbot version of a python hello-world project.
 
-# c['change_source'] = []
+c['change_source'] = change_source.gentoo_change_source()
 
 ####### SCHEDULERS
 
@@ -43,7 +56,7 @@ c['schedulers'] = schedulers.gentoo_schedulers()
 # what steps, and which workers can execute them.  Note that any particular build will
 # only take place on one worker.
 
-c['builders'] = builders.gentoo_builders()
+c['builders'] = builders.gentoo_builders(worker_data)
 
 ####### BUILDBOT SERVICES
 
@@ -51,9 +64,9 @@ c['builders'] = builders.gentoo_builders()
 # status of each build will be pushed to these targets. buildbot/reporters/*.py
 # has a variety to choose from, like IRC bots.
 
-c['services'] = [
-    service.GentooCiService(basedir)
-]
+c['services'] = []
+c['services'].append(service.GentooCiService(basedir))
+c['services'] = reporters.gentoo_reporters(r=c['services'])
 
 ####### PROJECT IDENTITY
 
@@ -71,12 +84,21 @@ c['titleURL'] = "https://gentoo-ci.gentoo.org"
 c['buildbotURL'] = "http://localhost:8010/"
 
 # minimalistic config to activate new web UI
-c['www'] = dict(port=8010,
-                plugins=dict(waterfall_view={}, console_view={}, grid_view={}))
+c['www'] = dict(port=8010, plugins=dict(waterfall_view={}, console_view={}, grid_view={}))
+
+c['www']['ui_default_config'] = {
+    'Waterfall.lazy_limit_waterfall': 408,
+    'Console.buildLimit': 1000,
+    'Console.changeLimit': 150,
+    'Grid.revisionLimit': 30,
+    'BuildRequests.buildrequestFetchLimit': 100,
+    'ChangeBuilds.buildsFetchLimit': 150,
+    'Changes.changesFetchLimit': 150,
+}
 
 ####### DB URL
 # This specifies what database buildbot uses to store its state.
 # It's easy to start with sqlite, but it's recommended to switch to a dedicated
 # database, such as PostgreSQL or MySQL, for use in production environments.
 # http://docs.buildbot.net/current/manual/configuration/global.html#database-specification
-c['db_url'] = "mysql://buildbot:xxx@192.168.1.x/buildbot?max_idle=300"
+c['db_url'] = "postgresql://buildbot:password@ip/buildbot"

[gentoo-commits] proj/tinderbox-cluster:master commit in: /

[Magnus Granberg]

commit:     a3b98d25abca54b394db944e3f3258100ab89e09
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  4 14:29:14 2015 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Tue Aug  4 14:29:14 2015 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=a3b98d25

 update setup.py to support repoman

 setup.py | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/setup.py b/setup.py
index e68da85..85f5fbb 100644
--- a/setup.py
+++ b/setup.py
@@ -8,21 +8,19 @@ except ImportError:
 	use_setuptools()
 	from setuptools import setup
 
-version = os.path.split(os.path.abspath(__file__))[-2].split('-')[-1]
-
-packages = ['tbc']
-
-package_dir = {'tbc': 'tbc/pym'}
-
+def find_packages():
+        for dirpath, dirnames, filenames in os.walk('tbc/pym'):
+                if '__init__.py' in filenames:
+                        yield os.path.relpath(dirpath, 'tbc/pym')
 setup(
-	name="tbc",
-	version=version,
-	author='Zorry',
-	author_email='tinderbox-cluster@gentoo.org',
-	url='https://anongit.gentoo.org/git/proj/tinderbox-cluster.git',
-	description='Tinderbox cluster',
-	platforms=["any"],
-	license="GPL2",
-	packages=packages,
-	package_dir=package_dir,
-)
\ No newline at end of file
+        version = os.path.split(os.path.abspath(__file__))[-2].split('-')[-1],
+        packages = list(find_packages()),
+        package_dir = {'': 'tbc/pym'},
+        name="tbc",
+        author='Zorry',
+        author_email='tinderbox-cluster@gentoo.org',
+        url='https://anongit.gentoo.org/git/proj/tinderbox-cluster.git',
+        description='Tinderbox cluster',
+        platforms=["any"],
+        license="GPL2",
+)

[gentoo-commits] proj/tinderbox-cluster:master commit in: /

[Magnus Granberg]

commit:     2c53bcfdef8b0d980b7b8bf4d7300512b6a34495
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 18 19:17:29 2015 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sat Apr 18 19:17:29 2015 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=2c53bcfd

remove frontend stuff in gitignore

 .gitignore | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1658d1c..9710542 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,3 @@
 # Backup files
 *~
-# log dir
-frontend/static/logs
-# Python compiled files
 *.pyc
-frontend/python/tinderbox/settings.py
-frontend/python/tinderbox/wsgi.py

[gentoo-commits] proj/tinderbox-cluster:master commit in: /

[Magnus Granberg]

commit:     174a8b78de84e80e037fa28ac4c09efade49e926
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 18 19:53:13 2015 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sat Apr 18 19:53:13 2015 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=174a8b78

fix btc to tbc in setup

 setup.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index bf78af8..e68da85 100644
--- a/setup.py
+++ b/setup.py
@@ -10,12 +10,12 @@ except ImportError:
 
 version = os.path.split(os.path.abspath(__file__))[-2].split('-')[-1]
 
-packages = ['btc']
+packages = ['tbc']
 
-package_dir = {'btc': 'btc/pym'}
+package_dir = {'tbc': 'tbc/pym'}
 
 setup(
-	name="btc",
+	name="tbc",
 	version=version,
 	author='Zorry',
 	author_email='tinderbox-cluster@gentoo.org',

[gentoo-commits] proj/tinderbox-cluster:master commit in: /

[Magnus Granberg]

commit:     dc90a2950499d828e53885cfb09bc56838645fa7
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 18 19:15:03 2015 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sat Apr 18 19:15:03 2015 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=dc90a295

add gitignore and setup

 .gitignore |  8 ++++++++
 setup.py   | 28 ++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1658d1c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+# Backup files
+*~
+# log dir
+frontend/static/logs
+# Python compiled files
+*.pyc
+frontend/python/tinderbox/settings.py
+frontend/python/tinderbox/wsgi.py

diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..bf78af8
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,28 @@
+import os
+
+try:
+	from setuptools import setup
+except ImportError:
+	raise
+	from ez_setup import use_setuptools
+	use_setuptools()
+	from setuptools import setup
+
+version = os.path.split(os.path.abspath(__file__))[-2].split('-')[-1]
+
+packages = ['btc']
+
+package_dir = {'btc': 'btc/pym'}
+
+setup(
+	name="btc",
+	version=version,
+	author='Zorry',
+	author_email='tinderbox-cluster@gentoo.org',
+	url='https://anongit.gentoo.org/git/proj/tinderbox-cluster.git',
+	description='Tinderbox cluster',
+	platforms=["any"],
+	license="GPL2",
+	packages=packages,
+	package_dir=package_dir,
+)
\ No newline at end of file