[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: whitespace fixes

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
70416022 by Holger Levsen at 2020-02-29T17:03:01+01:00
whitespace fixes

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
10578989 by Holger Levsen at 2020-02-29T17:58:35+01:00
reproducible Debian: fixup navigation highlighting for some old pages

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
b78a784e by Holger Levsen at 2020-02-29T17:59:31+01:00
reproducible Debian builtin-pho: include (no)buildinfo pages properly in navigation

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


2 changed files:

- bin/reproducible_common.sh
- bin/reproducible_html_builtin-pho.sh


Changes:

=====================================
bin/reproducible_common.sh
=====================================
@@ -166,17 +166,17 @@ set_icon() {
 	case "$1" in
 		reproducible)		ICON=weather-clear.png
 					;;
-		FTBR)		ICON=weather-showers-scattered.png
+		FTBR)			ICON=weather-showers-scattered.png
 					STATE_TARGET_NAME="FTBR"
 					;;
 		FTBFS)			ICON=weather-storm.png
 					;;
-		timeout)	ICON=Current_event_clock.png ;;
+		timeout)		ICON=Current_event_clock.png ;;
 		depwait)		ICON=weather-snow.png
 					;;
 		E404)			ICON=weather-severe-alert.png
 					;;
-		NFU)		ICON=weather-few-clouds-night.png
+		NFU)			ICON=weather-few-clouds-night.png
 					STATE_TARGET_NAME="NFU"
 					;;
 		blacklisted)		ICON=error.png
@@ -222,16 +222,27 @@ write_page_header() {
 		|| [ "$1" = "repositories" ] \
 		|| [ "$1" = "variations" ] \
 		|| [ "$1" = "suite_arch_stats" ] \
+		|| [ "$1" = "no_buildinfos" ] \
+		|| [ "$1" = "buildinfos" ] \
 		|| [ "$1" = "bugs" ] \
 		|| [ "$1" = "nodes_health" ] \
 		|| [ "$1" = "job_health" ] \
+		|| [ "$1" = "nodes_daily_graphs" ] \
 		|| [ "$1" = "nodes_weekly_graphs" ] \
-		|| [ "$1" = "nodes_daily_graphs" ] ; then
+		|| [ "$1" = "nodes_monthly_graphs" ] \
+		|| [ "$1" = "nodes_yeary_graphs" ] ; then
 		displayed_page="\"$1\": \"true\""
 	else
 		displayed_page=''
 	fi
 
+	if [ "$1" = "no_buildinfos" ] \
+		|| [ "$1" = "buildinfos" ] ; then
+		suite_arch_nav_template="\"suite_arch_nav_template\": \"/debian/{{suite}}/{{arch}}/index_$1.html\""
+	else
+		suite_arch_nav_template=''
+	fi
+
 	# Create json for suite links (a list of objects)
 	suite_links="\"suite_nav\": { \"suite_list\": ["
 	comma=0
@@ -285,6 +296,9 @@ write_page_header() {
 	if [[ ! -z $include_pkgset_link ]] ; then
 		context+=", $include_pkgset_link"
 	fi
+	if [[ ! -z $suite_arch_nav_template ]] ; then
+		context+=", $suite_arch_nav_template"
+	fi
 	context+="}"
 
 	write_page "<header class=\"head\">"


=====================================
bin/reproducible_html_builtin-pho.sh
=====================================
@@ -19,6 +19,8 @@ common_init "$@"
 # ToDo:
 # - create graphs
 # - import the data from the database on pb7 into the one on jenkins
+# - fix off by one error
+# - include data for stretch and experimental
 
 get_localsuite() {
 	if [ "$SUITE" = "unstable" ] ; then



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/6c4fa249f2ee2139ddc35c871c66c337da538501...b78a784e1a555d009841947567f5610cbdcb2b01

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/6c4fa249f2ee2139ddc35c871c66c337da538501...b78a784e1a555d009841947567f5610cbdcb2b01
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/20200229/b8af7691/attachment-0001.html>