Commit 0ab61da0 authored by Jelle van der Waa's avatar Jelle van der Waa Committed by Holger Levsen

Change Arch and Alpine BLACKLIST status to blacklist

Change the status of blacklisted packages to conform the same status
which Debian uses.
Signed-off-by: Holger Levsen's avatarHolger Levsen <holger@layer-acht.org>
parent 2f9aa5ab
...@@ -121,7 +121,7 @@ update_alpine_repositories() { ...@@ -121,7 +121,7 @@ update_alpine_repositories() {
AND s.architecture='x86_64' AND s.architecture='x86_64'
AND s.name='$PKG' AND s.name='$PKG'
AND s.suite='$SUITE';") AND s.suite='$SUITE';")
if [ "$PKG_STATUS" = "BLACKLISTED" ] ; then if [ "$PKG_STATUS" = "blacklisted" ] ; then
echo "$PKG is blacklisted, so not scheduling it." echo "$PKG is blacklisted, so not scheduling it."
continue continue
else else
...@@ -199,7 +199,7 @@ update_alpine_repositories() { ...@@ -199,7 +199,7 @@ update_alpine_repositories() {
FROM sources AS s JOIN results AS r ON s.id = r.package_id FROM sources AS s JOIN results AS r ON s.id = r.package_id
WHERE s.distribution=$DISTROID WHERE s.distribution=$DISTROID
AND s.architecture='x86_64' AND s.architecture='x86_64'
AND r.status != 'BLACKLISTED' AND r.status != 'blacklisted'
AND r.build_date < '$MINDATE' AND r.build_date < '$MINDATE'
AND s.id NOT IN (SELECT schedule.package_id FROM schedule) AND s.id NOT IN (SELECT schedule.package_id FROM schedule)
GROUP BY s.id, s.name GROUP BY s.id, s.name
......
...@@ -121,7 +121,7 @@ update_archlinux_repositories() { ...@@ -121,7 +121,7 @@ update_archlinux_repositories() {
AND s.architecture='x86_64' AND s.architecture='x86_64'
AND s.name='$PKG' AND s.name='$PKG'
AND s.suite='$SUITE';") AND s.suite='$SUITE';")
if [ "$PKG_STATUS" = "BLACKLISTED" ] ; then if [ "$PKG_STATUS" = "blacklisted" ] ; then
echo "$PKG is blacklisted, so not scheduling it." echo "$PKG is blacklisted, so not scheduling it."
continue continue
else else
...@@ -199,7 +199,7 @@ update_archlinux_repositories() { ...@@ -199,7 +199,7 @@ update_archlinux_repositories() {
FROM sources AS s JOIN results AS r ON s.id = r.package_id FROM sources AS s JOIN results AS r ON s.id = r.package_id
WHERE s.distribution=$DISTROID WHERE s.distribution=$DISTROID
AND s.architecture='x86_64' AND s.architecture='x86_64'
AND r.status != 'BLACKLISTED' AND r.status != 'blacklisted'
AND r.build_date < '$MINDATE' AND r.build_date < '$MINDATE'
AND s.id NOT IN (SELECT schedule.package_id FROM schedule) AND s.id NOT IN (SELECT schedule.package_id FROM schedule)
GROUP BY s.id, s.name GROUP BY s.id, s.name
......
...@@ -986,7 +986,7 @@ include_icon(){ ...@@ -986,7 +986,7 @@ include_icon(){
local PNG= local PNG=
ALT=${ALT,,} ALT=${ALT,,}
case $STATE in case $STATE in
BLACKLISTED) blacklisted)
PNG=error;; PNG=error;;
DEPWAIT_*) DEPWAIT_*)
PNG=weather-snow;; PNG=weather-snow;;
...@@ -1106,7 +1106,7 @@ create_pkg_html() { ...@@ -1106,7 +1106,7 @@ create_pkg_html() {
WHERE s.architecture='x86_64' WHERE s.architecture='x86_64'
AND s.name='$SRCPACKAGE' AND s.name='$SRCPACKAGE'
AND s.suite='archlinux_$REPOSITORY';") AND s.suite='archlinux_$REPOSITORY';")
if [ "$STATE" = "BLACKLISTED" ] ; then if [ "$STATE" = "blacklisted" ] ; then
buffer_message='blacklisted' buffer_message='blacklisted'
else else
STATE=UNKNOWN STATE=UNKNOWN
...@@ -1283,7 +1283,7 @@ create_alpine_pkg_html() { ...@@ -1283,7 +1283,7 @@ create_alpine_pkg_html() {
WHERE s.architecture='x86_64' WHERE s.architecture='x86_64'
AND s.name='$SRCPACKAGE' AND s.name='$SRCPACKAGE'
AND s.suite='alpine_$REPOSITORY';") AND s.suite='alpine_$REPOSITORY';")
if [ "$STATE" = "BLACKLISTED" ] ; then if [ "$STATE" = "blacklisted" ] ; then
buffer_message='blacklisted' buffer_message='blacklisted'
else else
STATE=UNKNOWN STATE=UNKNOWN
......
...@@ -689,7 +689,8 @@ schema_updates = { ...@@ -689,7 +689,8 @@ schema_updates = {
"('openwrt')" "('openwrt')"
], ],
43: [ 43: [
"UPDATE results SET status='reproducible' WHERE status='GOOD'" "UPDATE results SET status='reproducible' WHERE status='GOOD'",
"UPDATE results SET status='blacklisted' WHERE status='BLACKLISTED'"
], ],
} }
......
...@@ -31,7 +31,7 @@ get_state_from_counter() { ...@@ -31,7 +31,7 @@ get_state_from_counter() {
2) STATE=FTBFS ;; 2) STATE=FTBFS ;;
3) STATE=DEPWAIT ;; 3) STATE=DEPWAIT ;;
4) STATE=404 ;; 4) STATE=404 ;;
5) STATE=BLACKLISTED ;; 5) STATE=blacklisted ;;
6) STATE=UNKNOWN ;; 6) STATE=UNKNOWN ;;
esac esac
} }
...@@ -62,7 +62,7 @@ repostats(){ ...@@ -62,7 +62,7 @@ repostats(){
NR_FTBFS=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE 'FTBFS_%';") NR_FTBFS=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE 'FTBFS_%';")
NR_DEPWAIT=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE 'DEPWAIT_%';") NR_DEPWAIT=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE 'DEPWAIT_%';")
NR_404=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE '404_%';") NR_404=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE '404_%';")
NR_BLACKLISTED=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status='BLACKLISTED';") NR_BLACKLISTED=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status='blacklisted';")
NR_UNKNOWN=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE 'UNKNOWN_%';") NR_UNKNOWN=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE 'UNKNOWN_%';")
NR_UNTESTED=$(query_db "SELECT count(s.name) FROM sources AS s WHERE s.architecture='x86_64' AND s.distribution=$DISTROID AND s.suite='$SUITE' AND s.id NOT IN (SELECT package_id FROM results)") NR_UNTESTED=$(query_db "SELECT count(s.name) FROM sources AS s WHERE s.architecture='x86_64' AND s.distribution=$DISTROID AND s.suite='$SUITE' AND s.id NOT IN (SELECT package_id FROM results)")
if [ $NR_UNTESTED -ne 0 ] ; then if [ $NR_UNTESTED -ne 0 ] ; then
...@@ -190,7 +190,7 @@ alpine_repostats_table(){ ...@@ -190,7 +190,7 @@ alpine_repostats_table(){
write_page " <th><a href='/alpine/state_FTBFS.html'>failing to build</a></th>" write_page " <th><a href='/alpine/state_FTBFS.html'>failing to build</a></th>"
write_page " <th><a href='/alpine/state_DEPWAIT.html'>in depwait state</a></th>" write_page " <th><a href='/alpine/state_DEPWAIT.html'>in depwait state</a></th>"
write_page " <th><a href='/alpine/state_404.html'>download problems</a></th>" write_page " <th><a href='/alpine/state_404.html'>download problems</a></th>"
write_page " <th><a href='/alpine/state_BLACKLISTED.html'>blacklisted</a></th>" write_page " <th><a href='/alpine/state_blacklisted.html'>blacklisted</a></th>"
write_page " <th><a href='/alpine/state_UNKNOWN.html'>unknown state</a></th></tr>" write_page " <th><a href='/alpine/state_UNKNOWN.html'>unknown state</a></th></tr>"
cat $HTML_REPOSTATS >> $PAGE cat $HTML_REPOSTATS >> $PAGE
write_page " </table>" write_page " </table>"
...@@ -248,7 +248,7 @@ repository_pages(){ ...@@ -248,7 +248,7 @@ repository_pages(){
} }
state_pages(){ state_pages(){
for STATE in FTBFS FTBR DEPWAIT 404 reproducible BLACKLISTED UNKNOWN ; do for STATE in FTBFS FTBR DEPWAIT 404 reproducible blacklisted UNKNOWN ; do
PAGE=state_$STATE.html PAGE=state_$STATE.html
TITLE="Reproducible alpine, packages in state $STATE" TITLE="Reproducible alpine, packages in state $STATE"
alpine_page_header alpine_page_header
...@@ -305,7 +305,7 @@ state_pages(){ ...@@ -305,7 +305,7 @@ state_pages(){
repository_state_pages(){ repository_state_pages(){
for REPOSITORY in $ALPINE_REPOS ; do for REPOSITORY in $ALPINE_REPOS ; do
SUITE="alpine_$REPOSITORY" SUITE="alpine_$REPOSITORY"
for STATE in FTBFS FTBR DEPWAIT 404 reproducible BLACKLISTED UNKNOWN ; do for STATE in FTBFS FTBR DEPWAIT 404 reproducible blacklisted UNKNOWN ; do
PAGE=state_${REPOSITORY}_$STATE.html PAGE=state_${REPOSITORY}_$STATE.html
TITLE="Reproducible alpine, packages in $REPOSITORY in state $STATE" TITLE="Reproducible alpine, packages in $REPOSITORY in state $STATE"
alpine_page_header alpine_page_header
......
...@@ -30,7 +30,7 @@ get_state_from_counter() { ...@@ -30,7 +30,7 @@ get_state_from_counter() {
2) STATE=FTBFS ;; 2) STATE=FTBFS ;;
3) STATE=DEPWAIT ;; 3) STATE=DEPWAIT ;;
4) STATE=404 ;; 4) STATE=404 ;;
5) STATE=BLACKLISTED ;; 5) STATE=blacklisted ;;
6) STATE=UNKNOWN ;; 6) STATE=UNKNOWN ;;
esac esac
} }
...@@ -61,7 +61,7 @@ repostats(){ ...@@ -61,7 +61,7 @@ repostats(){
NR_FTBFS=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE 'FTBFS_%';") NR_FTBFS=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE 'FTBFS_%';")
NR_DEPWAIT=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE 'DEPWAIT_%';") NR_DEPWAIT=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE 'DEPWAIT_%';")
NR_404=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE '404_%';") NR_404=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE '404_%';")
NR_BLACKLISTED=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status='BLACKLISTED';") NR_BLACKLISTED=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status='blacklisted';")
NR_UNKNOWN=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE 'UNKNOWN_%';") NR_UNKNOWN=$(query_db "SELECT count(*) FROM sources AS s JOIN results AS r ON s.id=r.package_id WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE' AND r.status LIKE 'UNKNOWN_%';")
NR_UNTESTED=$(query_db "SELECT count(s.name) FROM sources AS s WHERE s.architecture='x86_64' AND s.distribution=$DISTROID AND s.suite='$SUITE' AND s.id NOT IN (SELECT package_id FROM results)") NR_UNTESTED=$(query_db "SELECT count(s.name) FROM sources AS s WHERE s.architecture='x86_64' AND s.distribution=$DISTROID AND s.suite='$SUITE' AND s.id NOT IN (SELECT package_id FROM results)")
if [ $NR_UNTESTED -ne 0 ] ; then if [ $NR_UNTESTED -ne 0 ] ; then
...@@ -189,7 +189,7 @@ archlinux_repostats_table(){ ...@@ -189,7 +189,7 @@ archlinux_repostats_table(){
write_page " <th><a href='/archlinux/state_FTBFS.html'>failing to build</a></th>" write_page " <th><a href='/archlinux/state_FTBFS.html'>failing to build</a></th>"
write_page " <th><a href='/archlinux/state_DEPWAIT.html'>in depwait state</a></th>" write_page " <th><a href='/archlinux/state_DEPWAIT.html'>in depwait state</a></th>"
write_page " <th><a href='/archlinux/state_404.html'>download problems</a></th>" write_page " <th><a href='/archlinux/state_404.html'>download problems</a></th>"
write_page " <th><a href='/archlinux/state_BLACKLISTED.html'>blacklisted</a></th>" write_page " <th><a href='/archlinux/state_blacklisted.html'>blacklisted</a></th>"
write_page " <th><a href='/archlinux/state_UNKNOWN.html'>unknown state</a></th></tr>" write_page " <th><a href='/archlinux/state_UNKNOWN.html'>unknown state</a></th></tr>"
cat $HTML_REPOSTATS >> $PAGE cat $HTML_REPOSTATS >> $PAGE
write_page " </table>" write_page " </table>"
...@@ -247,7 +247,7 @@ repository_pages(){ ...@@ -247,7 +247,7 @@ repository_pages(){
} }
state_pages(){ state_pages(){
for STATE in FTBFS FTBR DEPWAIT 404 reproducible BLACKLISTED UNKNOWN ; do for STATE in FTBFS FTBR DEPWAIT 404 reproducible blacklisted UNKNOWN ; do
PAGE=state_$STATE.html PAGE=state_$STATE.html
TITLE="Reproducible archlinux, packages in state $STATE" TITLE="Reproducible archlinux, packages in state $STATE"
archlinux_page_header archlinux_page_header
...@@ -304,7 +304,7 @@ state_pages(){ ...@@ -304,7 +304,7 @@ state_pages(){
repository_state_pages(){ repository_state_pages(){
for REPOSITORY in $ARCHLINUX_REPOS ; do for REPOSITORY in $ARCHLINUX_REPOS ; do
SUITE="archlinux_$REPOSITORY" SUITE="archlinux_$REPOSITORY"
for STATE in FTBFS FTBR DEPWAIT 404 reproducible BLACKLISTED UNKNOWN ; do for STATE in FTBFS FTBR DEPWAIT 404 reproducible blacklisted UNKNOWN ; do
PAGE=state_${REPOSITORY}_$STATE.html PAGE=state_${REPOSITORY}_$STATE.html
TITLE="Reproducible archlinux, packages in $REPOSITORY in state $STATE" TITLE="Reproducible archlinux, packages in $REPOSITORY in state $STATE"
archlinux_page_header archlinux_page_header
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment