summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-03-13 13:16:15 +0100
committerHolger Levsen <holger@layer-acht.org>2015-03-13 13:16:15 +0100
commitec8ff0888f662ce0c1d770972df5b14b9d83e3b8 (patch)
tree98cad82fc1df286be94d14d048d6dc19d49267c8
parent7fcd9f7cb3bf46ad0b977906b9e8da0c58440928 (diff)
downloadjenkins.debian.net-ec8ff0888f662ce0c1d770972df5b14b9d83e3b8.tar.xz
reproducible: refactor, reduce db queries
-rwxr-xr-xbin/reproducible_build.sh5
-rwxr-xr-xbin/reproducible_common.sh1
-rwxr-xr-xbin/reproducible_scheduler.py3
-rw-r--r--job-cfg/reproducible.yaml2
4 files changed, 3 insertions, 8 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 18f5dfa1..8750f789 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -43,11 +43,6 @@ update_db_and_html() {
echo
echo "Successfully updated the database and updated $REPRODUCIBLE_URL/rb-pkg/${SUITE}/$SRCPACKAGE.html"
echo
- cd /srv/jenkins/bin
- python3 -c "from reproducible_html_indexes import build_page; \
- build_page('scheduled'); \
- build_page('last_24h', suite=\"$SUITE\", arch=\"$ARCH\"); \
- build_page('last_48h', suite=\"$SUITE\", arch=\"$ARCH\")" || true
}
call_debbindiff() {
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 99ba0538..a4ded0ba 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -241,7 +241,6 @@ gen_packages_html() {
string+=']'
python3 -c "from reproducible_html_packages import gen_packages_html; gen_packages_html(${string}, suite=\"${suite}\", no_clean=True)"
done
- python3 -c "from reproducible_html_packages import purge_old_pages; purge_old_pages()"
cd "$CWD"
}
diff --git a/bin/reproducible_scheduler.py b/bin/reproducible_scheduler.py
index 102957ff..9b35ca41 100755
--- a/bin/reproducible_scheduler.py
+++ b/bin/reproducible_scheduler.py
@@ -23,7 +23,7 @@ from urllib.request import urlopen
from reproducible_common import *
from reproducible_html_indexes import build_page
from reproducible_html_packages import gen_packages_html
-
+from reproducible_html_packages import purge_old_pages
def call_apt_update(suite):
# try three times, before failing the job
@@ -296,6 +296,7 @@ if __name__ == '__main__':
for suite in SUITES:
call_apt_update(suite)
update_sources_tables(suite)
+ purge_old_pages()
try:
overall = int(query_db('SELECT count(*) FROM schedule')[0][0])
except:
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 00cc1905..c3d29735 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -261,7 +261,7 @@
my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
- '{name}_html_indexes':
my_description: 'Generate HTML results (indexes) for reproducible builds.'
- my_timed: '59 * * * *'
+ my_timed: '*/15 * * * *'
my_shell: '/srv/jenkins/bin/reproducible_html_indexes.py'
my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
- '{name}_html_dd_list':