Add 'operator' property to ContainerKojiBuild model to determine whet…

…her it is an operator
redhat-exd-rebuilds · Sep 30, 2019 · 1fa97de · 1fa97de
1 parent a6e2235
commit 1fa97de
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 1 deletion.
diff --git a/estuary/models/koji.py b/estuary/models/koji.py
@@ -6,7 +6,7 @@
 
 from neomodel import (
     StringProperty, IntegerProperty, UniqueIdProperty, DateTimeProperty,
-    RelationshipTo, RelationshipFrom, ZeroOrOne)
+    BooleanProperty, RelationshipTo, RelationshipFrom, ZeroOrOne)
 
 from estuary.models.base import EstuaryStructuredNode
 from estuary.error import ValidationError
@@ -74,6 +74,7 @@ class ContainerKojiBuild(KojiBuild):
     original_nvr = StringProperty()
     triggered_by_freshmaker_event = RelationshipFrom(
         '.freshmaker.FreshmakerEvent', 'TRIGGERED', cardinality=ZeroOrOne)
+    operator = BooleanProperty(default=False)
 
 
 class ModuleKojiBuild(KojiBuild):

diff --git a/scrapers/koji.py b/scrapers/koji.py
@@ -198,6 +198,9 @@ def update_neo4j(self, builds):
                 extra_json = {}
 
             if self.is_container_build(build_dict):
+                build_params['operator'] = bool(
+                    extra_json.get('typeinfo', {}).get('operator_manifests', {}).get('archive')
+                )
                 try:
                     build = ContainerKojiBuild.create_or_update(build_params)[0]
                 except neomodel.exceptions.ConstraintValidationFailed:

diff --git a/tests/api/test_all_stories.py b/tests/api/test_all_stories.py
@@ -225,6 +225,7 @@
                     'extra': None,
                     'id': '811',
                     'name': 'some_build',
+                    'operator': False,
                     'original_nvr': None,
                     'release': '4.el7_4_as',
                     'resource_type': 'ContainerKojiBuild',
@@ -670,6 +671,7 @@
                     'extra': None,
                     'id': '811',
                     'name': 'some_build',
+                    'operator': False,
                     'original_nvr': None,
                     'release': '4.el7_4_as',
                     'resource_type': 'ContainerKojiBuild',
@@ -837,6 +839,7 @@
                     'extra': None,
                     'id': '811',
                     'name': 'some_build',
+                    'operator': False,
                     'original_nvr': None,
                     'release': '4.el7_4_as',
                     'resource_type': 'ContainerKojiBuild',

diff --git a/tests/api/test_get_resource.py b/tests/api/test_get_resource.py
@@ -423,6 +423,7 @@
             'extra': None,
             'id': '710',
             'name': 'slf4j_2',
+            'operator': True,
             'original_nvr': None,
             'release': '4.el7_4_as',
             'start_time': '2017-04-02T19:39:06Z',
@@ -443,6 +444,7 @@
         'id':'710',
         'name':'slf4j_2',
         'module_builds': [],
+        'operator': True,
         'original_nvr': None,
         'owner':None,
         'release':'4.el7_4_as',
@@ -602,6 +604,7 @@ def test_get_resources(client, resource, uid, expected):
         'epoch': '0',
         'id_': '710',
         'name': 'slf4j_2',
+        'operator': True,
         'release': '4.el7_4_as',
         'start_time': datetime(2017, 4, 2, 19, 39, 6),
         'state': 1,

diff --git a/tests/api/test_relationships.py b/tests/api/test_relationships.py
@@ -25,6 +25,7 @@
                 'id': '2011',
                 'module_builds': [],
                 'name': 'some_other_build',
+                'operator': False,
                 'original_nvr': None,
                 'owner': None,
                 'release': '4.el7_6_a',
@@ -61,6 +62,7 @@
                 'id': '811',
                 'module_builds': [],
                 'name': 'some_build',
+                'operator': False,
                 'original_nvr': None,
                 'owner': None,
                 'release': '4.el7_4_as',
@@ -97,6 +99,7 @@
                 'id': '710',
                 'module_builds': [],
                 'name': 'slf4j_2',
+                'operator': False,
                 'original_nvr': None,
                 'owner': None,
                 'release': '4.el7_4_as',
@@ -145,6 +148,7 @@ def test_one_to_many_node_relationships(client, resource, uid, relationship, exp
         'epoch': '0',
         'id_': '710',
         'name': 'slf4j_2',
+        'operator': False,
         'release': '4.el7_4_as',
         'start_time': datetime(2017, 4, 2, 19, 39, 6),
         'state': 1,
@@ -156,6 +160,7 @@ def test_one_to_many_node_relationships(client, resource, uid, relationship, exp
         'epoch': '0',
         'id_': '811',
         'name': 'some_build',
+        'operator': False,
         'release': '4.el7_4_as',
         'start_time': datetime(2018, 4, 2, 19, 39, 6),
         'state': 2,
@@ -167,6 +172,7 @@ def test_one_to_many_node_relationships(client, resource, uid, relationship, exp
         'epoch': '1',
         'id_': '2011',
         'name': 'some_other_build',
+        'operator': False,
         'release': '4.el7_6_a',
         'start_time': datetime(2018, 4, 2, 19, 39, 6),
         'state': 1,
@@ -200,6 +206,7 @@ def test_one_to_many_node_relationships_failed(client):
         'epoch': '0',
         'id_': '710',
         'name': 'slf4j_2',
+        'operator': False,
         'release': '4.el7_4_as',
         'start_time': datetime(2017, 4, 2, 19, 39, 6),
         'state': 1,

diff --git a/tests/api/test_siblings.py b/tests/api/test_siblings.py
@@ -220,6 +220,7 @@
                 'id': '811',
                 'module_builds': [],
                 'name': 'some_build',
+                'operator': False,
                 'original_nvr': None,
                 'owner': None,
                 'release': '4.el7_4_as',
@@ -269,6 +270,7 @@
                 'id': '710',
                 'module_builds': [],
                 'name': 'slf4j_2',
+                'operator': False,
                 'original_nvr': None,
                 'owner': None,
                 'release': '4.el7_4_as',
@@ -312,6 +314,7 @@
                         'extra': None,
                         'id': '811',
                         'name': 'some_build',
+                        'operator': False,
                         'original_nvr': None,
                         'release': '4.el7_4_as',
                         'resource_type': 'ContainerKojiBuild',
@@ -327,6 +330,7 @@
                         'extra': None,
                         'id': '710',
                         'name': 'slf4j_2',
+                        'operator': False,
                         'original_nvr': None,
                         'release': '4.el7_4_as',
                         'start_time': '2017-04-02T19:39:06Z',
@@ -605,6 +609,7 @@ def test_node_siblings(client, resource, uid, backward_rel, expected):
                 'id': '811',
                 'module_builds': [],
                 'name': 'some_build',
+                'operator': False,
                 'original_nvr': None,
                 'owner': None,
                 'release': '4.el7_4_as',
@@ -654,6 +659,7 @@ def test_node_siblings(client, resource, uid, backward_rel, expected):
                 'id': '710',
                 'module_builds': [],
                 'name': 'slf4j_2',
+                'operator': False,
                 'original_nvr': None,
                 'owner': None,
                 'release': '4.el7_4_as',

diff --git a/tests/api/test_story.py b/tests/api/test_story.py
@@ -124,6 +124,7 @@
                 'extra': None,
                 'id': '710',
                 'name': 'slf4j_2',
+                'operator': False,
                 'original_nvr': None,
                 'release': '4.el7_4_as',
                 'resource_type': 'ContainerKojiBuild',
@@ -328,6 +329,7 @@
                 'extra': None,
                 'id': '710',
                 'name': 'slf4j_2',
+                'operator': False,
                 'original_nvr': None,
                 'release': '4.el7_4_as',
                 'resource_type': 'ContainerKojiBuild',
@@ -492,6 +494,7 @@
                 'extra': None,
                 'id': '710',
                 'name': 'slf4j_2',
+                'operator': False,
                 'original_nvr': None,
                 'release': '4.el7_4_as',
                 'resource_type': 'ContainerKojiBuild',
@@ -655,6 +658,7 @@
                 'extra': None,
                 'id': '710',
                 'name': 'slf4j_2',
+                'operator': False,
                 'original_nvr': None,
                 'release': '4.el7_4_as',
                 'resource_type': 'ContainerKojiBuild',
@@ -823,6 +827,7 @@
                         'extra': None,
                         'id': '710',
                         'name': 'slf4j_2',
+                        'operator': False,
                         'original_nvr': None,
                         'release': '4.el7_4_as',
                         'start_time': '2017-08-14T05:43:51Z',
@@ -839,6 +844,7 @@
                 'extra': None,
                 'id': '710',
                 'name': 'slf4j_2',
+                'operator': False,
                 'original_nvr': None,
                 'release': '4.el7_4_as',
                 'resource_type': 'ContainerKojiBuild',
@@ -993,6 +999,7 @@
                 'id':'710',
                 'module_builds': [],
                 'name':'slf4j_2',
+                'operator': False,
                 'original_nvr':None,
                 'owner':None,
                 'release':'4.el7_4_as',
@@ -1139,6 +1146,7 @@
                 'extra': None,
                 'id': '710',
                 'name': 'slf4j_2',
+                'operator': False,
                 'original_nvr': None,
                 'release': '4.el7_4_as',
                 'resource_type': 'ContainerKojiBuild',
@@ -1163,6 +1171,7 @@
                         'extra': None,
                         'id': '710',
                         'name': 'slf4j_2',
+                        'operator': False,
                         'original_nvr': None,
                         'release': '4.el7_4_as',
                         'start_time': '2017-08-14T05:43:51Z',
@@ -1502,6 +1511,7 @@ def test_get_stories(client, resource, uids, expected):
                         'extra': None,
                         'id': '710',
                         'name': 'slf4j_2',
+                        'operator': False,
                         'original_nvr': None,
                         'release': '4.el7_4_as',
                         'start_time': '2017-08-14T05:43:51Z',
@@ -1519,6 +1529,7 @@ def test_get_stories(client, resource, uids, expected):
                 'extra': None,
                 'id': '710',
                 'name': 'slf4j_2',
+                'operator': False,
                 'original_nvr': None,
                 'release': '4.el7_4_as',
                 'resource_type': 'ContainerKojiBuild',
@@ -1953,6 +1964,7 @@ def test_get_story_partial_story(client):
                 'extra': None,
                 'id': '711',
                 'name': 'slf4j_2',
+                'operator': False,
                 'original_nvr': None,
                 'release': '4.el7_4_as',
                 'resource_type': 'ContainerKojiBuild',