Switch default branch from feature/1.0 to master

This updates the doc and git branches to match master instead of
feature/1.0.

Change-Id: Ifc98157328b2f9f56055fa0cdcfea5db5180fb7f
This commit is contained in:
David Moreau Simard 2019-06-04 19:52:18 -04:00
parent 47b98a6aea
commit cab932f0ed
No known key found for this signature in database
GPG Key ID: CBEB466764A9E621
9 changed files with 19 additions and 16 deletions

View File

@ -2,4 +2,4 @@
host=review.opendev.org host=review.opendev.org
port=29418 port=29418
project=recordsansible/ara project=recordsansible/ara
defaultbranch=feature/1.0 defaultbranch=master

View File

@ -219,3 +219,5 @@
post: post:
jobs: jobs:
- ara-upload-git-mirror - ara-upload-git-mirror
# This line left intentionally blank for reloading Zuul jobs after branch change

View File

@ -47,14 +47,14 @@ Live demos
You can find live demos deployed by the built-in ara_api_ and ara_web_ Ansible You can find live demos deployed by the built-in ara_api_ and ara_web_ Ansible
roles at https://api.demo.recordsansible.org and https://web.demo.recordsansible.org. roles at https://api.demo.recordsansible.org and https://web.demo.recordsansible.org.
.. _ara_api: https://ara.readthedocs.io/en/feature-1.0/ansible-role-ara-api.html .. _ara_api: https://ara.readthedocs.io/en/latest/ansible-role-ara-api.html
.. _ara_web: https://ara.readthedocs.io/en/feature-1.0/ansible-role-ara-web.html .. _ara_web: https://ara.readthedocs.io/en/latest/ansible-role-ara-web.html
Documentation Documentation
============= =============
Documentation for installing, configuring, running and using ARA is Documentation for installing, configuring, running and using ARA is
available on `readthedocs.io <https://ara.readthedocs.io/en/feature-1.0/>`_. available on `readthedocs.io <https://ara.readthedocs.io>`_.
Community and getting help Community and getting help
========================== ==========================

View File

@ -2,4 +2,4 @@ This directory contains scripts meant to help configuring ARA with Ansible.
For more information, visit the documentation_. For more information, visit the documentation_.
.. _documentation: http://ara.readthedocs.io/en/latest/configuration.html .. _documentation: https://ara.readthedocs.io/en/latest/ansible-configuration.html

View File

@ -30,26 +30,27 @@ in order to avoid conflicts with your Linux distribution python packages.
python3 -m venv ~/.ara/virtualenv python3 -m venv ~/.ara/virtualenv
To install the latest pre-release for ARA 1.0 from PyPi_: To install the latest release of ARA from PyPi_:
.. code-block:: bash .. code-block:: bash
# With the API server dependencies # With the API server dependencies
~/.ara/virtualenv/bin/pip install --pre ara[server] ~/.ara/virtualenv/bin/pip install ara[server]
# Without the API server dependencies # Without the API server dependencies
~/.ara/virtualenv/bin/pip install --pre ara ~/.ara/virtualenv/bin/pip install ara
Installing from source is possible by using the Installing from source is possible by using the git repository:
`feature/1.0 <https://github.com/ansible-community/ara@feature/1.0>`_ branch:
.. code-block:: bash .. code-block:: bash
# With the API server dependencies # With the API server dependencies
~/.ara/virtualenv/bin/pip install git+https://github.com/ansible-community/ara@feature/1.0[server] # (Suffixes don't work when supplying the direct git URL)
git clone https://github.com/ansible-community/ara ara-src
pip install ./ara-src[server]
# Without the API server dependencies # Without the API server dependencies
~/.ara/virtualenv/bin/pip install git+https://github.com/ansible-community/ara@feature/1.0 ~/.ara/virtualenv/bin/pip install git+https://github.com/ansible-community/ara
.. _PyPi: https://pypi.org/project/ara/ .. _PyPi: https://pypi.org/project/ara/

View File

@ -12,7 +12,7 @@ It is currently tested and supported against Ubuntu 18.04 and Fedora 29.
Role Variables Role Variables
-------------- --------------
See `defaults/main.yaml <https://github.com/ansible-community/ara/blob/feature/1.0/roles/ara_api/defaults/main.yaml>`_. See `defaults/main.yaml <https://github.com/ansible-community/ara/blob/master/roles/ara_api/defaults/main.yaml>`_.
.. literalinclude:: ../../roles/ara_api/defaults/main.yaml .. literalinclude:: ../../roles/ara_api/defaults/main.yaml
:language: yaml+jinja :language: yaml+jinja

View File

@ -47,7 +47,7 @@ ara_api_source_checkout: "{{ ara_api_root_dir }}/git/ara"
# When installing from PyPi, it would be a version number that has been released. # When installing from PyPi, it would be a version number that has been released.
# When using "latest" as the source version, HEAD will be used # When using "latest" as the source version, HEAD will be used
# When using "latest" as the pypi version, the latest release will be used # When using "latest" as the pypi version, the latest release will be used
ara_api_version: feature/1.0 ara_api_version: master
# The frontend/web server for serving the ARA API # The frontend/web server for serving the ARA API
# It is recommended to specify a web server when deploying a production environment. # It is recommended to specify a web server when deploying a production environment.

View File

@ -7,7 +7,7 @@ tests that do not require superuser privileges.
Role Variables Role Variables
-------------- --------------
See `defaults/main.yaml <https://github.com/ansible-community/ara/blob/feature/1.0/roles/ara_tests/defaults/main.yaml>`_. See `defaults/main.yaml <https://github.com/ansible-community/ara/blob/master/roles/ara_tests/defaults/main.yaml>`_.
.. literalinclude:: ../../roles/ara_tests/defaults/main.yaml .. literalinclude:: ../../roles/ara_tests/defaults/main.yaml
:language: yaml+jinja :language: yaml+jinja

View File

@ -12,7 +12,7 @@ It is currently tested and supported against Ubuntu 18.04 and Fedora 29.
Role Variables Role Variables
-------------- --------------
See `defaults/main.yaml <https://github.com/ansible-community/ara/blob/feature/1.0/roles/ara_web/defaults/main.yaml>`_. See `defaults/main.yaml <https://github.com/ansible-community/ara/blob/master/roles/ara_web/defaults/main.yaml>`_.
.. literalinclude:: ../../roles/ara_web/defaults/main.yaml .. literalinclude:: ../../roles/ara_web/defaults/main.yaml
:language: yaml+jinja :language: yaml+jinja