From a7683ad505585be4902f4d55931eaa89c47344aa Mon Sep 17 00:00:00 2001 From: Valerie R Young Date: Tue, 26 Jul 2016 14:28:34 -0400 Subject: reproducible debian: move mustache template directory out of bin Signed-off-by: Holger Levsen --- bin/reproducible_common.py | 2 +- bin/reproducible_common.sh | 2 +- bin/templates/basic_page.mustache | 26 ---- bin/templates/default_page_footer.mustache | 19 --- bin/templates/main_navigation.mustache | 162 --------------------- bin/templates/package_page.mustache | 52 ------- bin/templates/package_suitearch_details.mustache | 39 ----- bin/templates/package_suitearch_section.mustache | 30 ---- bin/templates/pkg_symbol_legend.mustache | 13 -- bin/templates/pkgset_details.mustache | 20 --- bin/templates/pkgset_navigation.mustache | 34 ----- bin/templates/project_links.mustache | 17 --- bin/templates/status_icon_link.mustache | 16 -- .../reproducible/basic_page.mustache | 26 ++++ .../reproducible/default_page_footer.mustache | 19 +++ .../reproducible/main_navigation.mustache | 162 +++++++++++++++++++++ .../reproducible/package_page.mustache | 52 +++++++ .../package_suitearch_details.mustache | 39 +++++ .../package_suitearch_section.mustache | 30 ++++ .../reproducible/pkg_symbol_legend.mustache | 13 ++ .../reproducible/pkgset_details.mustache | 20 +++ .../reproducible/pkgset_navigation.mustache | 34 +++++ .../reproducible/project_links.mustache | 17 +++ .../reproducible/status_icon_link.mustache | 16 ++ update_jdn.sh | 2 +- 25 files changed, 431 insertions(+), 431 deletions(-) delete mode 100644 bin/templates/basic_page.mustache delete mode 100644 bin/templates/default_page_footer.mustache delete mode 100644 bin/templates/main_navigation.mustache delete mode 100644 bin/templates/package_page.mustache delete mode 100644 bin/templates/package_suitearch_details.mustache delete mode 100644 bin/templates/package_suitearch_section.mustache delete mode 100644 bin/templates/pkg_symbol_legend.mustache delete mode 100644 bin/templates/pkgset_details.mustache delete mode 100644 bin/templates/pkgset_navigation.mustache delete mode 100644 bin/templates/project_links.mustache delete mode 100644 bin/templates/status_icon_link.mustache create mode 100644 mustache-templates/reproducible/basic_page.mustache create mode 100644 mustache-templates/reproducible/default_page_footer.mustache create mode 100644 mustache-templates/reproducible/main_navigation.mustache create mode 100644 mustache-templates/reproducible/package_page.mustache create mode 100644 mustache-templates/reproducible/package_suitearch_details.mustache create mode 100644 mustache-templates/reproducible/package_suitearch_section.mustache create mode 100644 mustache-templates/reproducible/pkg_symbol_legend.mustache create mode 100644 mustache-templates/reproducible/pkgset_details.mustache create mode 100644 mustache-templates/reproducible/pkgset_navigation.mustache create mode 100644 mustache-templates/reproducible/project_links.mustache create mode 100644 mustache-templates/reproducible/status_icon_link.mustache diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py index 92813e06..0a027b0b 100755 --- a/bin/reproducible_common.py +++ b/bin/reproducible_common.py @@ -48,7 +48,7 @@ defaultarch = 'amd64' BIN_PATH = '/srv/jenkins/bin' BASE = '/var/lib/jenkins/userContent/reproducible' DEBIAN_BASE = '/var/lib/jenkins/userContent/reproducible/debian' -TEMPLATE_PATH = BIN_PATH + '/templates' +TEMPLATE_PATH = '/srv/jenkins/mustache-templates/reproducible' PKGSET_DEF_PATH = '/srv/reproducible-results' TEMP_PATH="/tmp/reproducible" diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 211b425e..04578320 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -43,7 +43,7 @@ REPRODUCIBLE_DOT_ORG_URL=https://reproducible-builds.org JENKINS_URL=${JENKINS_URL:0:-1} DBDSUITE="unstable" BIN_PATH=/srv/jenkins/bin -TEMPLATE_PATH=$BIN_PATH/templates +TEMPLATE_PATH=/srv/jenkins/mustache-templates/reproducible # Debian suites being tested SUITES="testing unstable experimental" diff --git a/bin/templates/basic_page.mustache b/bin/templates/basic_page.mustache deleted file mode 100644 index f5fe0383..00000000 --- a/bin/templates/basic_page.mustache +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - {{{meta_refresh}}} - - {{#include_pkgset_js}} - - {{/include_pkgset_js}} - {{page_title}} - - - {{#navigation_html}} -
- {{{navigation_html}}} -
- {{/navigation_html}} - {{#navigation_html}}
{{/navigation_html}} - {{#main_header}} -

{{main_header}}

- {{/main_header}} - {{{main_html}}} - {{#navigation_html}}
{{/navigation_html}} - - diff --git a/bin/templates/default_page_footer.mustache b/bin/templates/default_page_footer.mustache deleted file mode 100644 index 5e97493b..00000000 --- a/bin/templates/default_page_footer.mustache +++ /dev/null @@ -1,19 +0,0 @@ - -

-

- {{#job_url}} - This page was built by the jenkins job {{job_name}} - which is configured via this git repo. - {{/job_url}} - There is more information - about jenkins.debian.net - and about reproducible builds of Debian - available elsewhere. -
Copyright 2014-2016 Holger Levsen - and many others. - The code of jenkins.debian.net.git - is mostly GPL-2 licensed. The weather icons are public domain and have been taken from the - Tango Icon Library. -
Last update: {{date}} -
-

diff --git a/bin/templates/main_navigation.mustache b/bin/templates/main_navigation.mustache deleted file mode 100644 index d1e425ae..00000000 --- a/bin/templates/main_navigation.mustache +++ /dev/null @@ -1,162 +0,0 @@ -

Debian Dashboard

 - - -{{{project_links_html}}} diff --git a/bin/templates/package_page.mustache b/bin/templates/package_page.mustache deleted file mode 100644 index 3261e417..00000000 --- a/bin/templates/package_page.mustache +++ /dev/null @@ -1,52 +0,0 @@ -
-

{{package}}

- - -{{{project_links_html}}} -
- diff --git a/bin/templates/package_suitearch_details.mustache b/bin/templates/package_suitearch_details.mustache deleted file mode 100644 index ac74be56..00000000 --- a/bin/templates/package_suitearch_details.mustache +++ /dev/null @@ -1,39 +0,0 @@ - diff --git a/bin/templates/package_suitearch_section.mustache b/bin/templates/package_suitearch_section.mustache deleted file mode 100644 index d8ac5304..00000000 --- a/bin/templates/package_suitearch_section.mustache +++ /dev/null @@ -1,30 +0,0 @@ - diff --git a/bin/templates/pkg_symbol_legend.mustache b/bin/templates/pkg_symbol_legend.mustache deleted file mode 100644 index 12fe485a..00000000 --- a/bin/templates/pkg_symbol_legend.mustache +++ /dev/null @@ -1,13 +0,0 @@ -

-A package name displayed with a bold -font is an indication that this package has a note. Visited -packages are linked in green, those which have not been visited are -linked in blue. -
-A # sign after the name of a package -indicates that a bug is filed against it. Likewise, a -+ sign indicates there is a -patch available, a P means a -pending bug while # indicates a -closed bug. In cases of several bugs, the symbol is repeated. -

diff --git a/bin/templates/pkgset_details.mustache b/bin/templates/pkgset_details.mustache deleted file mode 100644 index d29576a2..00000000 --- a/bin/templates/pkgset_details.mustache +++ /dev/null @@ -1,20 +0,0 @@ -

-{{#png}} - - package set {{pkgset_name}} in {{suite}}/{{arch}} - " - {{/png}} -
- The package set {{pkgset_name}} in - {{suite}}/{{arch}} consists of: -
- {{#status_details}} - {{{icon_html}}} {{status_count}} ({{status_percent}}%) packages - {{description}}: - {{{package_list_html}}} -
- {{/status_details}} - {{{pkg_symbol_legend_html}}} -

diff --git a/bin/templates/pkgset_navigation.mustache b/bin/templates/pkgset_navigation.mustache deleted file mode 100644 index 98bfd5ce..00000000 --- a/bin/templates/pkgset_navigation.mustache +++ /dev/null @@ -1,34 +0,0 @@ - -{{#package_set_sections}} -
- {{section}} package sets: - -
-{{/package_set_sections}} -{{#pkgset_page}} - -{{/pkgset_page}} diff --git a/bin/templates/project_links.mustache b/bin/templates/project_links.mustache deleted file mode 100644 index b457982e..00000000 --- a/bin/templates/project_links.mustache +++ /dev/null @@ -1,17 +0,0 @@ - diff --git a/bin/templates/status_icon_link.mustache b/bin/templates/status_icon_link.mustache deleted file mode 100644 index 66bebfcc..00000000 --- a/bin/templates/status_icon_link.mustache +++ /dev/null @@ -1,16 +0,0 @@ -{{^untested}} -{{#icon}} - - {{spokenstatus}} - -{{/icon}} -{{#spokenstatus}} - - {{spokenstatus}} - -{{/spokenstatus}} -{{/untested}} - -{{#untested}} -{{#icon}}{{spokenstatus}}{{/icon}} {{spokenstatus}} -{{/untested}} diff --git a/mustache-templates/reproducible/basic_page.mustache b/mustache-templates/reproducible/basic_page.mustache new file mode 100644 index 00000000..f5fe0383 --- /dev/null +++ b/mustache-templates/reproducible/basic_page.mustache @@ -0,0 +1,26 @@ + + + + + + {{{meta_refresh}}} + + {{#include_pkgset_js}} + + {{/include_pkgset_js}} + {{page_title}} + + + {{#navigation_html}} +
+ {{{navigation_html}}} +
+ {{/navigation_html}} + {{#navigation_html}}
{{/navigation_html}} + {{#main_header}} +

{{main_header}}

+ {{/main_header}} + {{{main_html}}} + {{#navigation_html}}
{{/navigation_html}} + + diff --git a/mustache-templates/reproducible/default_page_footer.mustache b/mustache-templates/reproducible/default_page_footer.mustache new file mode 100644 index 00000000..5e97493b --- /dev/null +++ b/mustache-templates/reproducible/default_page_footer.mustache @@ -0,0 +1,19 @@ + +

+

+ {{#job_url}} + This page was built by the jenkins job {{job_name}} + which is configured via this git repo. + {{/job_url}} + There is more information + about jenkins.debian.net + and about reproducible builds of Debian + available elsewhere. +
Copyright 2014-2016 Holger Levsen + and many others. + The code of jenkins.debian.net.git + is mostly GPL-2 licensed. The weather icons are public domain and have been taken from the + Tango Icon Library. +
Last update: {{date}} +
+

diff --git a/mustache-templates/reproducible/main_navigation.mustache b/mustache-templates/reproducible/main_navigation.mustache new file mode 100644 index 00000000..d1e425ae --- /dev/null +++ b/mustache-templates/reproducible/main_navigation.mustache @@ -0,0 +1,162 @@ +

Debian Dashboard

 + + +{{{project_links_html}}} diff --git a/mustache-templates/reproducible/package_page.mustache b/mustache-templates/reproducible/package_page.mustache new file mode 100644 index 00000000..3261e417 --- /dev/null +++ b/mustache-templates/reproducible/package_page.mustache @@ -0,0 +1,52 @@ +
+

{{package}}

+ + +{{{project_links_html}}} +
+ diff --git a/mustache-templates/reproducible/package_suitearch_details.mustache b/mustache-templates/reproducible/package_suitearch_details.mustache new file mode 100644 index 00000000..ac74be56 --- /dev/null +++ b/mustache-templates/reproducible/package_suitearch_details.mustache @@ -0,0 +1,39 @@ + diff --git a/mustache-templates/reproducible/package_suitearch_section.mustache b/mustache-templates/reproducible/package_suitearch_section.mustache new file mode 100644 index 00000000..d8ac5304 --- /dev/null +++ b/mustache-templates/reproducible/package_suitearch_section.mustache @@ -0,0 +1,30 @@ + diff --git a/mustache-templates/reproducible/pkg_symbol_legend.mustache b/mustache-templates/reproducible/pkg_symbol_legend.mustache new file mode 100644 index 00000000..12fe485a --- /dev/null +++ b/mustache-templates/reproducible/pkg_symbol_legend.mustache @@ -0,0 +1,13 @@ +

+A package name displayed with a bold +font is an indication that this package has a note. Visited +packages are linked in green, those which have not been visited are +linked in blue. +
+A # sign after the name of a package +indicates that a bug is filed against it. Likewise, a ++ sign indicates there is a +patch available, a P means a +pending bug while # indicates a +closed bug. In cases of several bugs, the symbol is repeated. +

diff --git a/mustache-templates/reproducible/pkgset_details.mustache b/mustache-templates/reproducible/pkgset_details.mustache new file mode 100644 index 00000000..d29576a2 --- /dev/null +++ b/mustache-templates/reproducible/pkgset_details.mustache @@ -0,0 +1,20 @@ +

+{{#png}} + + package set {{pkgset_name}} in {{suite}}/{{arch}} + " + {{/png}} +
+ The package set {{pkgset_name}} in + {{suite}}/{{arch}} consists of: +
+ {{#status_details}} + {{{icon_html}}} {{status_count}} ({{status_percent}}%) packages + {{description}}: + {{{package_list_html}}} +
+ {{/status_details}} + {{{pkg_symbol_legend_html}}} +

diff --git a/mustache-templates/reproducible/pkgset_navigation.mustache b/mustache-templates/reproducible/pkgset_navigation.mustache new file mode 100644 index 00000000..98bfd5ce --- /dev/null +++ b/mustache-templates/reproducible/pkgset_navigation.mustache @@ -0,0 +1,34 @@ + +{{#package_set_sections}} +
+ {{section}} package sets: + +
+{{/package_set_sections}} +{{#pkgset_page}} + +{{/pkgset_page}} diff --git a/mustache-templates/reproducible/project_links.mustache b/mustache-templates/reproducible/project_links.mustache new file mode 100644 index 00000000..b457982e --- /dev/null +++ b/mustache-templates/reproducible/project_links.mustache @@ -0,0 +1,17 @@ + diff --git a/mustache-templates/reproducible/status_icon_link.mustache b/mustache-templates/reproducible/status_icon_link.mustache new file mode 100644 index 00000000..66bebfcc --- /dev/null +++ b/mustache-templates/reproducible/status_icon_link.mustache @@ -0,0 +1,16 @@ +{{^untested}} +{{#icon}} + + {{spokenstatus}} + +{{/icon}} +{{#spokenstatus}} + + {{spokenstatus}} + +{{/spokenstatus}} +{{/untested}} + +{{#untested}} +{{#icon}}{{spokenstatus}}{{/icon}} {{spokenstatus}} +{{/untested}} diff --git a/update_jdn.sh b/update_jdn.sh index 7a03540a..d2cd94cb 100755 --- a/update_jdn.sh +++ b/update_jdn.sh @@ -502,7 +502,7 @@ explain "packages configured." # cd $BASEDIR [ -d /srv/jenkins/features ] && sudo rm -rf /srv/jenkins/features -for dir in bin logparse cucumber live ; do +for dir in bin logparse cucumber live mustache-templates ; do sudo mkdir -p /srv/jenkins/$dir sudo rsync -rpt --delete $dir/ /srv/jenkins/$dir/ sudo chown -R jenkins-adm.jenkins-adm /srv/jenkins/$dir -- cgit v1.2.3-70-g09d2