| 1 |
commit: 1a48ccb70732fa8367c36c842861c080c03eb1a2 |
| 2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 25 11:42:02 2022 +0000 |
| 4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 25 11:42:02 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=1a48ccb7 |
| 7 |
|
| 8 |
Add support for test on merge_request |
| 9 |
|
| 10 |
Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org> |
| 11 |
|
| 12 |
buildbot_gentoo_ci/steps/builders.py | 10 ++++++++++ |
| 13 |
buildbot_gentoo_ci/steps/portage.py | 5 +++++ |
| 14 |
2 files changed, 15 insertions(+) |
| 15 |
|
| 16 |
diff --git a/buildbot_gentoo_ci/steps/builders.py b/buildbot_gentoo_ci/steps/builders.py |
| 17 |
index 3b6a8d0..00980e3 100644 |
| 18 |
--- a/buildbot_gentoo_ci/steps/builders.py |
| 19 |
+++ b/buildbot_gentoo_ci/steps/builders.py |
| 20 |
@@ -1296,6 +1296,16 @@ class SetupStepts(BuildStep): |
| 21 |
if build: |
| 22 |
yield log.addStdout('Runing Build: YES\n') |
| 23 |
aftersteps_list.append(RunBuild()) |
| 24 |
+ # run tests |
| 25 |
+ test = False |
| 26 |
+ if self.getProperty('projectrepository_data')['test']: |
| 27 |
+ test = True |
| 28 |
+ if self.getProperty('projectrepository_data')['test_mr'] and self.getProperty("event") == 'merge_request': |
| 29 |
+ test = True |
| 30 |
+ if test: |
| 31 |
+ yield log.addStdout('Runing Test: YES\n') |
| 32 |
+ else: |
| 33 |
+ yield log.addStdout('Runing Test: NO\n') |
| 34 |
# run eclean pkg and dist |
| 35 |
#if build: |
| 36 |
#f.addStep(builders.RunEclean(step='pkg') |
| 37 |
|
| 38 |
diff --git a/buildbot_gentoo_ci/steps/portage.py b/buildbot_gentoo_ci/steps/portage.py |
| 39 |
index ff06c58..6d838d7 100644 |
| 40 |
--- a/buildbot_gentoo_ci/steps/portage.py |
| 41 |
+++ b/buildbot_gentoo_ci/steps/portage.py |
| 42 |
@@ -295,7 +295,12 @@ class SetPackageDefault(BuildStep): |
| 43 |
yield log.addStdout(line + separator1) |
| 44 |
# for test we need to add env and use |
| 45 |
#FIXME: check restrictions, test use mask and required use |
| 46 |
+ test = False |
| 47 |
if self.getProperty('projectrepository_data')['test']: |
| 48 |
+ test = True |
| 49 |
+ if self.getProperty('projectrepository_data')['test_mr'] and self.getProperty("event") == 'merge_request': |
| 50 |
+ test = True |
| 51 |
+ if test: |
| 52 |
auxdb_iuses = yield self.gentooci.db.versions.getMetadataByUuidAndMatadata(self.getProperty("version_data")['uuid'], 'iuse') |
| 53 |
for auxdb_iuse in auxdb_iuses: |
| 54 |
iuse, status = getIUseValue(auxdb_iuse['value']) |
Archives