[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible debian: fix SQL syntax

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
cd4ee15d by Mattia Rizzolo at 2019-12-03T12:30:48Z
reproducible debian: fix SQL syntax

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
8c515b2d by Mattia Rizzolo at 2019-12-03T12:39:51Z
reprodcible debian: maintenance: drop SQL condition that doesn't make sense and it's now an error with the timestamp type

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


2 changed files:

- bin/reproducible_maintenance.sh
- bin/reproducible_scheduler.py


Changes:

=====================================
bin/reproducible_maintenance.sh
=====================================
@@ -508,8 +508,7 @@ if [ "$HOSTNAME" = "$MAINNODE" ] ; then
 	QUERY="
 		SELECT s.id, s.name, p.date_scheduled, p.date_build_started
 			FROM schedule AS p JOIN sources AS s ON p.package_id=s.id
-			WHERE p.date_scheduled != ''
-			AND p.date_build_started IS NOT NULL
+			WHERE p.date_build_started IS NOT NULL
 			AND p.date_build_started < '$DATE'
 			ORDER BY p.date_scheduled
 		"


=====================================
bin/reproducible_scheduler.py
=====================================
@@ -486,7 +486,7 @@ def query_new_versions(suite, arch, limit):
                AND s.version != r.version
                AND r.status != 'blacklisted'
                AND s.id IN (SELECT package_id FROM results)
-               AND s.id NOT IN (SELECT schedule.package_id FROM schedule AND build_type='ci_build')
+               AND s.id NOT IN (SELECT schedule.package_id FROM schedule WHERE build_type='ci_build')
                GROUP BY s.id, s.name, s.version, r.version
                ORDER BY max_date
                LIMIT {limit}""".format(suite=suite, arch=arch, limit=limit)
@@ -511,7 +511,7 @@ def query_old_ftbfs_versions(suite, arch, limit):
                 AND r.status='FTBFS'
                 AND ( n.bugs = '[]' OR n.bugs IS NULL )
                 AND r.build_date < '{date}'
-                AND s.id NOT IN (SELECT schedule.package_id FROM schedule AND build_type='ci_build')
+                AND s.id NOT IN (SELECT schedule.package_id FROM schedule WHERE build_type='ci_build')
                 GROUP BY s.id, s.name
                 ORDER BY max_date
                 LIMIT {limit}""".format(suite=suite, arch=arch, limit=limit,
@@ -530,7 +530,7 @@ def query_old_depwait_versions(suite, arch, limit):
                 WHERE s.suite='{suite}' AND s.architecture='{arch}'
                 AND r.status='depwait'
                 AND r.build_date < '{date}'
-                AND s.id NOT IN (SELECT schedule.package_id FROM schedule AND build_type='ci_build')
+                AND s.id NOT IN (SELECT schedule.package_id FROM schedule WHERE build_type='ci_build')
                 GROUP BY s.id, s.name
                 ORDER BY max_date
                 LIMIT {limit}""".format(suite=suite, arch=arch, limit=limit,
@@ -550,7 +550,7 @@ def query_old_versions(suite, arch, limit):
                 WHERE s.suite='{suite}' AND s.architecture='{arch}'
                 AND r.status != 'blacklisted'
                 AND r.build_date < '{date}'
-                AND s.id NOT IN (SELECT schedule.package_id FROM schedule AND build_type='ci_build')
+                AND s.id NOT IN (SELECT schedule.package_id FROM schedule WHERE build_type='ci_build')
                 GROUP BY s.id, s.name
                 ORDER BY max_date
                 LIMIT {limit}""".format(suite=suite, arch=arch,
@@ -568,7 +568,7 @@ def query_e404_versions(suite, arch, limit):
                 WHERE s.suite='{suite}' AND s.architecture='{arch}'
                 AND r.status = 'E404'
                 AND r.build_date < '{date}'
-                AND s.id NOT IN (SELECT schedule.package_id FROM schedule AND build_type='ci_build')
+                AND s.id NOT IN (SELECT schedule.package_id FROM schedule WHERE build_type='ci_build')
                 GROUP BY s.id, s.name
                 ORDER BY max_date
                 LIMIT {limit}""".format(suite=suite, arch=arch, limit=limit,



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/4249c24c82dfb9b55942b0a217da1b82a67053de...8c515b2d17a2ef72fcdd1fd3fb812a2cd873ce77

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/4249c24c82dfb9b55942b0a217da1b82a67053de...8c515b2d17a2ef72fcdd1fd3fb812a2cd873ce77
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20191203/51888642/attachment-0001.html>