jobs: Rename dependency check to installcheck

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/jobs.py b/src/buildservice/jobs.py
index a1bc2f6ac008611dcddc8b05a08c1fe7a657250c..80303d1eb48f0450e329265b72e80b5c8a077cfc 100644 (file)
--- a/src/buildservice/jobs.py
+++ b/src/buildservice/jobs.py
@@ -105,7 +105,7 @@ class Jobs(base.Object):
 
                async with asyncio.TaskGroup() as tg:
                        for job in jobs:
-                               task = tg.create_task(job.depcheck())
+                               task = tg.create_task(job.installcheck())
                                tasks.append(task)
 
                # Try to dispatch any jobs afterwards if at least one task returned True
@@ -138,7 +138,7 @@ class Queue(base.Object):
                                AND
                                        jobs.finished_at IS NULL
                                AND
-                                       jobs.depcheck_succeeded IS TRUE
+                                       jobs.installcheck_succeeded IS TRUE
                                ORDER BY
                                        _rank
                """)
@@ -837,9 +837,9 @@ class Job(base.DataObject):
                """
                return self.build.build_repo.pakfire(arch=self.arch, **kwargs)
 
-       async def depcheck(self):
+       async def installcheck(self):
                """
-                       Perform dependency check
+                       Perform install check
                """
                return await self.build.build_repo.installcheck([self])
 
@@ -865,7 +865,7 @@ class Job(base.DataObject):
 
                # Store any dependency errors
                except DependencyError as e:
-                       self._set_attribute("depcheck_succeeded", False)
+                       self._set_attribute("installcheck_succeeded", False)
 
                        # Store the message
                        self._set_attribute("message", "%s" % e)
@@ -876,21 +876,21 @@ class Job(base.DataObject):
 
                # Everything OK
                else:
-                       self._set_attribute("depcheck_succeeded", True)
+                       self._set_attribute("installcheck_succeeded", True)
 
                # Store the timestamp
-               self._set_attribute_now("depcheck_performed_at")
+               self._set_attribute_now("installcheck_performed_at")
 
                # Return the status
-               return self.depcheck_succeeded
+               return self.installcheck_succeeded
 
        @property
-       def depcheck_succeeded(self):
-               return self.data.depcheck_succeeded
+       def installcheck_succeeded(self):
+               return self.data.installcheck_succeeded
 
        @property
-       def depcheck_performed_at(self):
-               return self.data.depcheck_performed_at
+       def installcheck_performed_at(self):
+               return self.data.installcheck_performed_at
 
        # Reverse Requires
 

diff --git a/src/database.sql b/src/database.sql
index 87b770d6fdfe261be2f03aacb0da47e7778997d6..2f2b81209380cd079f5e9c586fd8873ebc7acdf9 100644 (file)
--- a/src/database.sql
+++ b/src/database.sql
@@ -141,8 +141,8 @@ CREATE TABLE public.jobs (
     builder_id integer,
     message text,
     superseeded_by integer,
-    depcheck_succeeded boolean,
-    depcheck_performed_at timestamp without time zone,
+    installcheck_succeeded boolean,
+    installcheck_performed_at timestamp without time zone,
     failed boolean DEFAULT false NOT NULL,
     log_path text,
     log_size bigint,
@@ -1696,7 +1696,7 @@ CREATE INDEX jobs_finished_at ON public.jobs USING btree (finished_at DESC) WHER
 -- Name: jobs_pending; Type: INDEX; Schema: public; Owner: -
 --
 
-CREATE INDEX jobs_pending ON public.jobs USING btree (id) WHERE ((deleted_at IS NULL) AND (started_at IS NULL) AND (finished_at IS NULL) AND (depcheck_succeeded IS TRUE));
+CREATE INDEX jobs_pending ON public.jobs USING btree (id) WHERE ((deleted_at IS NULL) AND (started_at IS NULL) AND (finished_at IS NULL) AND (installcheck_succeeded IS TRUE));
 
 
 --

diff --git a/src/scripts/pakfire-build-service b/src/scripts/pakfire-build-service
index 89f6b0b9f136f3a8f81ca086d24a64708f459dff..06aa0b773cae0c0292e4dbab4bd9d4b9a86923c7 100644 (file)
--- a/src/scripts/pakfire-build-service
+++ b/src/scripts/pakfire-build-service
@@ -29,7 +29,7 @@ class Cli(object):
                        "cleanup"             : self.backend.cleanup,
 
                        # Jobs
-                       "jobs:depcheck"       : self._jobs_depcheck,
+                       "jobs:installcheck"   : self._jobs_installcheck,
 
                        # Keys
                        "keys:generate"       : self.backend.keys.generate,
@@ -96,9 +96,9 @@ class Cli(object):
                # Exit with error code
                sys.exit(r or 0)
 
-       async def _jobs_depcheck(self, *uuids):
+       async def _jobs_installcheck(self, *uuids):
                """
-                       Test command to trigger a dependency check
+                       Test command to trigger a installcheck check
                """
                jobs = []
 
@@ -113,7 +113,7 @@ class Cli(object):
 
                # Run the checks
                for job in jobs:
-                       await job.depcheck()
+                       await job.installcheck()
 
        def _list_repository(self, distro_name, repo_name, arch):
                # Get distribution

diff --git a/src/templates/jobs/modules/list.html b/src/templates/jobs/modules/list.html
index c1a3d2403389e6a2f1cb9888ebb592ff0d756254..92bf6010ab2acbe232e32d0a1b8a084747894697 100644 (file)
--- a/src/templates/jobs/modules/list.html
+++ b/src/templates/jobs/modules/list.html
@@ -3,7 +3,7 @@
 
        <div class="block">
                <article class="panel
-                               {% if job.is_pending() and job.depcheck_succeeded is False %}
+                               {% if job.is_pending() and job.installcheck_succeeded is False %}
                                        is-warning
                                {% elif job.is_aborted() %}
                                        is-dark
@@ -30,7 +30,7 @@
                                        </div>
 
                                        <div class="level-right">
-                                               {% if job.is_pending() and job.depcheck_succeeded is False %}
+                                               {% if job.is_pending() and job.installcheck_succeeded is False %}
                                                        <span class="tag">{{ _("Dependency Problems") }}</span>
                                                {% elif job.is_pending() %}
                                                        <span class="tag">{{ _("Pending") }}</span>
@@ -54,7 +54,7 @@
                                </div>
 
                        {# Dependency Issues #}
-                       {% elif job.is_pending() and job.depcheck_succeeded is False %}
+                       {% elif job.is_pending() and job.installcheck_succeeded is False %}
                                <div class="panel-block">
                                        <ul>
                                                {% for line in job.message.splitlines() %}

diff --git a/tests/build.py b/tests/build.py
index 821a8bf6e3eba84c265087de5541641dd8a70d0c..797af50a2d3cf5f40e5732ab785fb0b7d2572828 100755 (executable)
--- a/tests/build.py
+++ b/tests/build.py
@@ -93,9 +93,9 @@ class BuildTestCase(test.TestCase):
                # has not been finished, yet
                self.assertEqual(len(self.backend.jobs.queue), 0)
 
-               # Pretend the dependency check was successful
+               # Pretend the install check was successful
                for job in build.jobs:
-                       job._set_attribute("depcheck_succeeded", True)
+                       job._set_attribute("installcheck_succeeded", True)
 
                # There should now be two jobs in the queue
                self.assertEqual(len(self.backend.jobs.queue), 2)