X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=docs%2Fconfiguration.rst;h=239ee6af244244b029a18c7ae482df5eaa86281d;hb=b9d610a9e522d71a89d2daeb6f71b2bc2a71cdf7;hp=97e9d5b67b390bcca3d1923f2936c961f9aaacaa;hpb=38522a995531929d2505115adf2df59e470f2a0e;p=releng%2Fglobal-jjb.git diff --git a/docs/configuration.rst b/docs/configuration.rst index 97e9d5b6..239ee6af 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -51,7 +51,7 @@ values used by global-jjb templates. :github_pr_org: The name of the GitHub organization. All members of this organization will be able to trigger jobs. -:github_pr_whitelist: List of GitHub members you wish to be able to +:github_pr_allowlist: List of GitHub members you wish to be able to trigger jobs. :github_pr_admin_list: List of GitHub members that will have admin @@ -81,7 +81,7 @@ Example GitHub Infra: # lf-infra defaults jenkins-ssh-credential: jenkins-ssh github-org: lfit - github_pr_whitelist: + github_pr_allowlist: - jpwku - tykeal - zxiiro @@ -98,7 +98,7 @@ Jenkins Files global-jjb makes use of the Jenkins Config File Provider plugin to provide some default configurations for certain tools. This section details the files to -define in Jenkins' **Manage Files** configuration. +define in Jenkins' **Managed Files** configuration (eg: https://jenkins.example.org/configfiles/index). .. _npmrc: @@ -113,12 +113,48 @@ Documentation for npmrc is available via the `npm project proxy is not available for the project. :type: Custom file -Create a "Custom file" with contents: +Create a **Custom file** with contents: .. code-block:: ini registry = https://nexus.opendaylight.org/content/repositories/npmjs/ +.. _clouds-yaml: + +clouds-yaml +----------- + +Needed by ``openstack client`` and ``packer`` to fetch OpenStack +credentials and configuration. This file is OpenStack's `clouds.yaml +`_ +file. + +:Optional: Needed for jobs that use ``openstack client``. ``packer`` if + building against OpenStack infra. +:type: Custom file + +Create a **Custom file** with contents: + +.. code-block:: yaml + + clouds: + vex: + auth: + project_name: OS_PROJECT_NAME + username: OS_USERNAME + password: OS_PASSWORD + auth_url: 'https://auth.vexxhost.net/v3/' + user_domain_name: Default + project_domain_name: Default + region_name: ca-ymq-1 + +.. warning:: + + If using packer 1.3.0 make sure that the clouds.yaml **profile** + configuration is **NOT** configured. Using **profile** causes packer to look + for another file called ``clouds-public.yaml`` for configuration. + + .. _pipconf: pipconf @@ -132,7 +168,7 @@ in $HOME/.config/pip/pip.conf. Documentation for pip.conf is available via the proxy is not available for the project. :type: Custom file -Create a "Custom file" with contents: +Create a **Custom file** with contents: .. code-block:: ini @@ -146,13 +182,13 @@ jjbini ------ This file contains the Jenkins Job Builder `configuration -`_ +`_ for :doc:`jjb/lf-ci-jobs`. :Required: This file MUST exist. :type: Custom file -Create a "Custom file" with contents: +Create a **Custom file** with contents: .. code-block:: ini