diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9582152b30ea035c10a80e5cbad4776d79ad6be..d92e1ea2d6f590d8799614996cf39bf073cc1328 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,7 @@ default: variables: OSNAME: apertis + OS_WEBSITE: www.apertis.org GITLAB_RULES_GIT: $CI_SERVER_URL/infrastructure/$OSNAME-infrastructure.git GITLAB_RULES_FILE: gitlab-scripts/rulez.yaml DEBUG: @@ -562,6 +563,7 @@ packaging-updates-upstream-linux: --current-job-url "$CI_JOB_URL" --current-pipeline-url "$CI_PIPELINE_URL" --new-pipeline-url "$CI_PROJECT_URL/-/pipelines/new?ref=$CI_COMMIT_REF_NAME" + --os-website-url "${OS_WEBSITE}" - ./bin/tsv --data packaging.json --destdir tsv/ diff --git a/bin/dashboard b/bin/dashboard index 84a7a889bcdf0a58f8a44f923ddf6a293a6298ce..59df49b153022a0ca956b14bfdaf11ab4a8f97f8 100755 --- a/bin/dashboard +++ b/bin/dashboard @@ -134,7 +134,7 @@ def render(packaging_data, storage_data, destdir): logging.debug(f"Generating {destdir}/{html}.html") rendered = env.get_template(f"{html}.html.jinja2").render( - **data, both_data=both_data + **data, both_data=both_data, website_url=args.os_website_url ) with open(destdir / f"{html}.html", "w") as html_file: html_file.write(rendered) @@ -190,6 +190,11 @@ if __name__ == "__main__": type=argparse.FileType("r"), help="storage stats input file in YAML format", ) + parser.add_argument( + "--os-website-url", + default="www.apertis.org", + help="URL to the OS website", + ) parser.add_argument("--destdir", required=True, type=str, help="output directory") args = parser.parse_args() diff --git a/templates/base.html.jinja2 b/templates/base.html.jinja2 index dcbe92a9629998f330045ea5b421d634621a491e..449bceb272e498b2dc304f43c36b04b5bf5cf793 100644 --- a/templates/base.html.jinja2 +++ b/templates/base.html.jinja2 @@ -58,6 +58,10 @@ </div> {% block content %} {% endblock %} + + <div class="d-flex align-items-baseline justify-content-between"> + {% block legend %}{% endblock %} + </div> </main> </body> </html> diff --git a/templates/index.html.jinja2 b/templates/index.html.jinja2 index adc26213aadc12d02f6b5b1611b87b0a103c1a82..0b5dec59e7ca82b6b084a60975b2d89cb2e1c773 100644 --- a/templates/index.html.jinja2 +++ b/templates/index.html.jinja2 @@ -456,3 +456,23 @@ {% endfor %} </div> {% endblock %} + +{% block legend %} + <div class="list-group"> + <p> + <strong>🛈 Legend: </strong> + <ul> + <li><big><span class="badge badge-danger">error</span></big>: This tag reports an error that needs to be fixed!</li> + <li><big><span class="badge badge-warning">warning</span></big>: This tag reports an issue that needs to be investigated!</li> + <li><big><span class="badge badge-info">info</span></big>: This tag reports only information.</li> + <li><big><span class="badge border">licensing</span></big>: This tag is about a potential issue with the package license, see <a href="https://{{ website_url }}/policies/license-expectations/">License Expectations</a>.</li> + <li><big><span class="badge border">delta</span></big>: This tag is about the changes in packages against upstream, see <a href="https://{{ website_url }}/policies/upstreaming/">Upstreaming</a>.</li> + <li><big><span class="badge border">update</span></big>: This tag is about available package updates, see <a href="https://{{ website_url }}/policies/release-flow/">Release flow</a>.</li> + <li><big><span class="badge border">git</span></big>: This tag is about a potential issue with source packages in Git repositories, see <a href="https://{{ website_url }}/policies/package_maintenance/">Package maintenance</a>.</li> + <li><big><span class="badge border">apt</span></big>: This tag is about a potential issue with binary packages in Apt repositories, see <a href="https://{{ website_url }}/policies/package_maintenance/">Package maintenance</a>.</li> + <li><big><span class="badge border">obs</span></big>: This tag is about a potential issue with packages in OBS repositories, see <a href="https://{{ website_url }}/policies/package_maintenance/">Package maintenance</a>.</li> + </ul> + </p> + <p>For more information, please refer to the Apertis policy at <a href="https://{{ website_url }}/">{{ website_url }}</a>.</p> + </div> +{% endblock %}