[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/db/, buildbot_gentoo_ci/config/, buildbot_gentoo_ci/steps/

[Magnus Granberg]

commit:     080b3d481d7e239a941ae866d804cef49df537c5
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  7 09:01:13 2021 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sun Feb  7 09:01:13 2021 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=080b3d48

Add run pretend on packages update on worker

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

 buildbot_gentoo_ci/config/buildfactorys.py | 35 +++++++++++++++++++
 buildbot_gentoo_ci/db/model.py             |  2 +-
 buildbot_gentoo_ci/steps/builders.py       | 54 +++++++++++++++++++++++++++++-
 buildbot_gentoo_ci/steps/update_db.py      |  2 +-
 4 files changed, 90 insertions(+), 3 deletions(-)

diff --git a/buildbot_gentoo_ci/config/buildfactorys.py b/buildbot_gentoo_ci/config/buildfactorys.py
index 861a4e1..2916847 100644
--- a/buildbot_gentoo_ci/config/buildfactorys.py
+++ b/buildbot_gentoo_ci/config/buildfactorys.py
@@ -108,4 +108,39 @@ def run_build_request():
     f.addStep(builders.UpdateRepos())
     # setup make.conf
     f.addStep(builders.SetMakeConf())
+    # setup package.*
+    #f.addStep(portages.SetPackageUse())
+    # setup env
+    # setup files in /etc if needed
+    # run --regen if needed on repo
+    # update packages before any tests
+    # run pretend on packages update on worker
+    shell_commad_list = [
+                    'emerge',
+                    '-uDNv',
+                    '--changed-deps',
+                    '--changed-use',
+                    '--pretend',
+                    '@world'
+                    ]
+    f.addStep(buildbot_steps.SetPropertyFromCommandNewStyle(
+                        command=shell_commad_list,
+                        strip=True,
+                        extract_fn=builders.PersOutputOfEmerge,
+                        workdir='/'
+                        ))
+    #   look at the log to see if we need to do stuff
+    #   run update package on worker
+    #   check log
+    # run pretend @preserved-rebuild if needed
+    #   look at the log to see if we need to do stuff
+    #   run @preserved-rebuild
+    #   check log
+    # run depclean if set
+    #   depclean pretend
+    #   look at the log to see if we need to do stuff
+    #   depclean
+    #   check log
+    # setup make.conf if build id has changes make.conf as dict from SetMakeConf
+    # setup package.* env if build id has changes
     return f

diff --git a/buildbot_gentoo_ci/db/model.py b/buildbot_gentoo_ci/db/model.py
index bd111be..4c5e04c 100644
--- a/buildbot_gentoo_ci/db/model.py
+++ b/buildbot_gentoo_ci/db/model.py
@@ -216,7 +216,7 @@ class Model(base.DBConnectorComponent):
         # project's name
         sa.Column('keyword_id', sa.Integer,
                   sa.ForeignKey('keywords.id', ondelete='CASCADE')),
-        sa.Column('versions_uuid', sa.String(36),
+        sa.Column('version_uuid', sa.String(36),
                   sa.ForeignKey('versions.uuid', ondelete='CASCADE')),
         sa.Column('status', sa.Enum('stable','unstable','negative','all'), nullable=False),
     )

diff --git a/buildbot_gentoo_ci/steps/builders.py b/buildbot_gentoo_ci/steps/builders.py
index 085d096..862f0d4 100644
--- a/buildbot_gentoo_ci/steps/builders.py
+++ b/buildbot_gentoo_ci/steps/builders.py
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 import os
+import re
 
 from twisted.internet import defer
 from twisted.python import log
@@ -11,6 +12,56 @@ from buildbot.process.results import SUCCESS
 from buildbot.process.results import FAILURE
 from buildbot.plugins import steps
 
+def PersOutputOfEmerge(rc, stdout, stderr):
+    emerge_output = {}
+    emerge_output['rc'] = rc
+    package_dict = {}
+    print(stderr)
+    for line in stdout.split('\n'):
+        # package list
+        subdict = {}
+        if line.startswith('[ebuild'):
+            # split the line
+            # if binaries
+            if line.startswith('[ebuild'):
+                subdict['binary'] = False
+            else:
+                subdict['binary'] = True
+            # action [ N ] stuff
+            subdict['action'] = line[8:15].replace(' ', '')
+            # cpv
+            cpv_split = re.search('] (.+?) ', line).group(1).split(':')
+            cpv = cpv_split[0]
+            # repository
+            # slot
+            if cpv_split[1] == '':
+                subdict['slot'] = None
+                subdict['repository'] = cpv_split[2]
+            else:
+                subdict['slot'] = cpv_split[1]
+                subdict['repository'] = cpv_split[3]
+            # if action U version cpv
+            if 'U' in subdict['action']:
+                subdict['old_version'] = re.search(' \[(.+?)] ', line).group(1).split(':')
+            else:
+                subdict['old_version'] = None
+            # Use list
+            if 'USE=' in line:
+                subdict['use'] = re.search('USE="(.+?)" ', line).group(1).split(' ')
+            else:
+                subdict['use'] = None
+            # PYTHON_TARGETS list
+            if 'PYTHON_TARGETS=' in line:
+                subdict['python_targets'] = re.search('PYTHON_TARGETS="(.+?)" ', line).group(1).split(' ')
+            else:
+                subdict['python_targets'] = None
+            # CPU_FLAGS_X86 list
+            package_dict[cpv] = subdict
+        #FIXME: Handling of stderr output
+    return {
+        'emerge_output' : emerge_output
+        }
+
 class TriggerRunBuildRequest(BuildStep):
     
     name = 'TriggerRunBuildRequest'
@@ -259,6 +310,7 @@ class SetMakeConf(BuildStep):
                 makeconf_variable_list.append('--rebuild-if-new-rev=y')
                 makeconf_variable_list.append('--rebuilt-binaries=y')
                 makeconf_variable_list.append('--usepkg=y')
+                makeconf_variable_list.append('--binpkg-respect-use=y')
                 makeconf_variable_list.append('--nospinner')
                 makeconf_variable_list.append('--color=n')
                 makeconf_variable_list.append('--ask=n')
@@ -279,7 +331,7 @@ class SetMakeConf(BuildStep):
             if k['variable'] == 'ACCEPT_RESTRICT':
                 makeconf_variable_list.append('-fetch')
             for v in makeconf_variables_values_data:
-                if v['build_id'] is 0:
+                if v['build_id'] == 0:
                     makeconf_variable_list.append(v['value'])
             if k['variable'] == 'ACCEPT_LICENSE' and makeconf_variable_list != []:
                 makeconf_variable_list.append('ACCEPT_LICENSE="*"')

diff --git a/buildbot_gentoo_ci/steps/update_db.py b/buildbot_gentoo_ci/steps/update_db.py
index 1ffbbff..ee2ba88 100644
--- a/buildbot_gentoo_ci/steps/update_db.py
+++ b/buildbot_gentoo_ci/steps/update_db.py
@@ -124,7 +124,7 @@ class CheckCPVGentooCiProject(BuildStep):
     def run(self):
         #self.cpv_changes = self.getProperty("cpv_changes")
         self.cpv_changes = []
-        self.cpv_changes.append('dev-lang/python-3.9.1-r1')
+        self.cpv_changes.append('dev-python/django-3.1.5')
         self.cpv_changes.append('dev-python/scrypt-0.8.16')
         print(self.cpv_changes)
         print(self.getProperty("repository_data"))