zuul/zuul-jobs
Code Issues Proposed changes

Merge "Update documentation for Debian/Ubuntu mirror_info"

Browse Source
This commit is contained in:
Zuul 2019-08-20 18:25:43 +00:00 committed by Gerrit Code Review
commit 0a1de4786a
1 changed files with 52 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
doc/source/mirror.rst
View File

@ -29,17 +29,31 @@ For example:
opensuse: opensuse:
url: https://{{ zuul_site_local_mirror_host }}/opensuse url: https://{{ zuul_site_local_mirror_host }}/opensuse
debian: debian:
- url: https://{{ zuul_site_local_mirror_host }}/debian - type: deb
options:
trusted: true
url: https://{{ zuul_site_local_mirror_host }}/debian
suites: ['stretch', 'buster']
components: ['main'] components: ['main']
- url: https://{{ zuul_site_local_mirror_host }}/debian-security - type: deb
options:
trusted: true
url: https://{{ zuul_site_local_mirror_host }}/debian-security
suites: ['stretch/updates', 'buster/updates']
components: ['main'] components: ['main']
ubuntu: ubuntu:
- url: https://{{ zuul_site_local_mirror_host }}/ubuntu - type: deb
options:
trusted: true
url: https://{{ zuul_site_local_mirror_host }}/ubuntu
suites: ['xenial', 'bionic']
components: ['main', 'universe'] components: ['main', 'universe']
trusted: true - type: deb
- url: https://{{ zuul_site_local_mirror_host }}/ubuntu-security options:
trusted: true
url: https://{{ zuul_site_local_mirror_host }}/ubuntu
suites: ['xenial-security', 'bionic-security']
components: ['main', 'universe'] components: ['main', 'universe']
trusted: true
dockerhub: dockerhub:
url: https://{{ zuul_site_local_mirror_host }}:8082/ url: https://{{ zuul_site_local_mirror_host }}:8082/
@ -87,21 +101,32 @@ For example:
accomodates mirror systems which may have a security mirror at a accomodates mirror systems which may have a security mirror at a
different URL. different URL.
.. zuul:rolevar:: type
The type for a Debian mirror (usually either ``deb`` or
``deb-src``).
.. zuul:rolevar:: options
:type: dict
Mirror options, for example add ``trusted: yes`` in order
to trust unsigned APT mirrors.
.. zuul:rolevar:: url .. zuul:rolevar:: url
The URL for a Debian mirror. The URL for a Debian mirror.
.. zuul:rolevar:: suites
:type: list
The list of suites for a Debian mirror.
.. zuul:rolevar:: components .. zuul:rolevar:: components
:type: list :type: list
A list of components available in this mirror (e.g., A list of components available in this mirror (e.g.,
``main``, ``contrib``). ``main``, ``contrib``).
.. zuul:rolevar:: trusted
:default: False
Set to True in order to tag APT mirrors as trusted.
.. zuul:rolevar:: ubuntu .. zuul:rolevar:: ubuntu
:type: list :type: list
@ -109,21 +134,32 @@ For example:
accomodates mirror systems which may have a security mirror at a accomodates mirror systems which may have a security mirror at a
different URL. different URL.
.. zuul:rolevar:: type
The type for an Ubuntu mirror (usually either ``deb`` or
``deb-src``).
.. zuul:rolevar:: options
:type: dict
Mirror options, for example add ``trusted: yes`` in order
to trust unsigned APT mirrors.
.. zuul:rolevar:: url .. zuul:rolevar:: url
The URL for an Ubuntu mirror. The URL for an Ubuntu mirror.
.. zuul:rolevar:: suites
:type: list
The list of suites for an Ubuntu mirror.
.. zuul:rolevar:: components .. zuul:rolevar:: components
:type: list :type: list
A list of components available in this mirror (e.g., A list of components available in this mirror (e.g.,
``main``, ``contrib``). ``main``, ``contrib``).
.. zuul:rolevar:: trusted
:default: False
Set to True in order to tag APT mirrors as trusted.
.. zuul:rolevar:: dockerhub .. zuul:rolevar:: dockerhub
.. zuul:rolevar:: url .. zuul:rolevar:: url