Commit 5c62ea9d authored by Jelle van der Waa's avatar Jelle van der Waa Committed by Holger Levsen

rename status GOOD to reproducible for Arch and Alpine

Rename the 'GOOD' status to 'reproducible' so it aligns with the Debian
status and generating HTML pages using reproducible_html_indexes.py
works for Arch Linux as well.
Signed-off-by: Holger Levsen's avatarHolger Levsen <holger@layer-acht.org>
parent fa8e9192
...@@ -996,7 +996,7 @@ include_icon(){ ...@@ -996,7 +996,7 @@ include_icon(){
PNG=weather-storm;; PNG=weather-storm;;
FTBR_*) FTBR_*)
PNG=weather-showers-scattered ALT=unreproducible ;; PNG=weather-showers-scattered ALT=unreproducible ;;
GOOD) reproducible)
PNG=weather-clear ALT=reproducible ;; PNG=weather-clear ALT=reproducible ;;
esac esac
echo " <img src=\"/userContent/static/$PNG.png\" alt=\"$ALT icon\" /> $TEXT" >> $HTML_BUFFER echo " <img src=\"/userContent/static/$PNG.png\" alt=\"$ALT icon\" /> $TEXT" >> $HTML_BUFFER
...@@ -1120,7 +1120,7 @@ create_pkg_html() { ...@@ -1120,7 +1120,7 @@ create_pkg_html() {
include_icon $STATE "$buffer_message" include_icon $STATE "$buffer_message"
fi fi
else else
local STATE=GOOD local STATE=reproducible
local SOME_GOOD=false local SOME_GOOD=false
for ARTIFACT in $(cd $ARCHLINUX_PKG_PATH/ ; ls *.pkg.tar.xz.html) ; do for ARTIFACT in $(cd $ARCHLINUX_PKG_PATH/ ; ls *.pkg.tar.xz.html) ; do
if [ -z "$(echo $ARTIFACT | grep $VERSION)" ] ; then if [ -z "$(echo $ARTIFACT | grep $VERSION)" ] ; then
...@@ -1297,7 +1297,7 @@ create_alpine_pkg_html() { ...@@ -1297,7 +1297,7 @@ create_alpine_pkg_html() {
include_icon $STATE "$buffer_message" include_icon $STATE "$buffer_message"
fi fi
else else
local STATE=GOOD local STATE=reproducible
local SOME_GOOD=false local SOME_GOOD=false
for ARTIFACT in $(cd $ALPINE_PKG_PATH/ ; ls *.apk.html) ; do for ARTIFACT in $(cd $ALPINE_PKG_PATH/ ; ls *.apk.html) ; do
if [ -z "$(echo $ARTIFACT | grep $VERSION)" ] ; then if [ -z "$(echo $ARTIFACT | grep $VERSION)" ] ; then
......
...@@ -688,6 +688,9 @@ schema_updates = { ...@@ -688,6 +688,9 @@ schema_updates = {
"INSERT INTO distributions (name) VALUES " "INSERT INTO distributions (name) VALUES "
"('openwrt')" "('openwrt')"
], ],
43: [
"UPDATE results SET status='reproducible' WHERE status='GOOD'"
],
} }
......
...@@ -26,7 +26,7 @@ common_init "$@" ...@@ -26,7 +26,7 @@ common_init "$@"
get_state_from_counter() { get_state_from_counter() {
local counter=$1 local counter=$1
case $counter in case $counter in
0) STATE=GOOD ;; 0) STATE=reproducible ;;
1) STATE=FTBR ;; 1) STATE=FTBR ;;
2) STATE=FTBFS ;; 2) STATE=FTBFS ;;
3) STATE=DEPWAIT ;; 3) STATE=DEPWAIT ;;
...@@ -185,7 +185,7 @@ alpine_page_footer(){ ...@@ -185,7 +185,7 @@ alpine_page_footer(){
alpine_repostats_table(){ alpine_repostats_table(){
write_page " <table><tr><th>repository</th><th>all source packages</th>" write_page " <table><tr><th>repository</th><th>all source packages</th>"
write_page " <th><a href='/alpine/state_GOOD.html'>reproducible</a></th>" write_page " <th><a href='/alpine/state_reproducible.html'>reproducible</a></th>"
write_page " <th><a href='/alpine/state_FTBR.html'>unreproducible</a></th>" write_page " <th><a href='/alpine/state_FTBR.html'>unreproducible</a></th>"
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>"
...@@ -248,7 +248,7 @@ repository_pages(){ ...@@ -248,7 +248,7 @@ repository_pages(){
} }
state_pages(){ state_pages(){
for STATE in FTBFS FTBR DEPWAIT 404 GOOD 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 GOOD 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
......
...@@ -25,7 +25,7 @@ common_init "$@" ...@@ -25,7 +25,7 @@ common_init "$@"
get_state_from_counter() { get_state_from_counter() {
local counter=$1 local counter=$1
case $counter in case $counter in
0) STATE=GOOD ;; 0) STATE=reproducible ;;
1) STATE=FTBR ;; 1) STATE=FTBR ;;
2) STATE=FTBFS ;; 2) STATE=FTBFS ;;
3) STATE=DEPWAIT ;; 3) STATE=DEPWAIT ;;
...@@ -56,7 +56,7 @@ repostats(){ ...@@ -56,7 +56,7 @@ repostats(){
SUITE="archlinux_$REPOSITORY" SUITE="archlinux_$REPOSITORY"
TOTAL=$(query_db "SELECT count(*) FROM sources AS s WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE';") TOTAL=$(query_db "SELECT count(*) FROM sources AS s WHERE s.distribution=$DISTROID AND s.architecture='x86_64' AND s.suite='$SUITE';")
TESTED=$(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';") TESTED=$(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';")
NR_GOOD=$(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='GOOD';") NR_GOOD=$(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='reproducible';")
NR_FTBR=$(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 'FTBR_%';") NR_FTBR=$(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 'FTBR_%';")
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_%';")
...@@ -184,7 +184,7 @@ archlinux_page_footer(){ ...@@ -184,7 +184,7 @@ archlinux_page_footer(){
archlinux_repostats_table(){ archlinux_repostats_table(){
write_page " <table><tr><th>repository</th><th>all source packages</th>" write_page " <table><tr><th>repository</th><th>all source packages</th>"
write_page " <th><a href='/archlinux/state_GOOD.html'>reproducible</a></th>" write_page " <th><a href='/archlinux/state_reproducible.html'>reproducible</a></th>"
write_page " <th><a href='/archlinux/state_FTBR.html'>unreproducible</a></th>" write_page " <th><a href='/archlinux/state_FTBR.html'>unreproducible</a></th>"
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>"
...@@ -247,7 +247,7 @@ repository_pages(){ ...@@ -247,7 +247,7 @@ repository_pages(){
} }
state_pages(){ state_pages(){
for STATE in FTBFS FTBR DEPWAIT 404 GOOD 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 GOOD 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