Skip to content

Commit

Permalink
Merge pull request #55871 from Ch3LL/rc_docs
Browse files Browse the repository at this point in the history
Update release candidate docs to be more dynamic
  • Loading branch information
dwoz authored Jan 15, 2020
2 parents 648b90b + f355121 commit 523c254
Showing 1 changed file with 21 additions and 20 deletions.
41 changes: 21 additions & 20 deletions doc/topics/releases/releasecandidate.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@
Installing/Testing a Salt Release Candidate
===========================================

It's time for a new feature release of Salt! Follow the instructions below to
install the latest release candidate of Salt, and try :ref:`all the shiny new
features <release-2019-2-0>`! Be sure to report any bugs you find on `Github
When it's time for a new feature release of Salt, follow the instructions below to
install the latest release candidate of Salt, and try all the shiny new
features! Be sure to report any bugs you find on `Github
<https://github.com/saltstack/salt/issues/new/>`_.

Installing Using Packages
=========================

Builds for a few platforms are available as part of the RC at https://repo.saltstack.com/salt_rc/.
The builds should include the latest version of the OS that is currently available.

.. note::

Expand All @@ -34,37 +35,32 @@ Builds for a few platforms are available as part of the RC at https://repo.salts
baseurl=https://repo.saltstack.com/salt_rc/py3/redhat/$releasever/$basearch/
For Ubuntu Python 2
For Ubuntu Python 2 (replace os_version, with ubuntu version. For example 18.04)

.. code-block:: none
deb http://repo.saltstack.com/salt_rc/apt/ubuntu/18.04/amd64 bionic main
deb http://repo.saltstack.com/salt_rc/apt/ubuntu/<os_version>/amd64 bionic main
For Ubuntu Python 3
For Ubuntu Python 3 (replace os_version, with ubuntu version. For example 18.04)

.. code-block:: none
deb http://repo.saltstack.com/salt_rc/py3/ubuntu/18.04/amd64 bionic main
deb http://repo.saltstack.com/salt_rc/py3/ubuntu/<os_version>/amd64 bionic main
For Debian Python 2
For Debian Python 2 (replace os_version, with debian version. For example 9)

.. code-block:: none
deb http://repo.saltstack.com/salt_rc/apt/debian/9/amd64 stretch main
deb http://repo.saltstack.com/salt_rc/apt/debian/<os_version>/amd64 stretch main
For Debian Python 3
For Debian Python 3 (replace os_version, with debian version. For example 9)

.. code-block:: none
deb http://repo.saltstack.com/salt_rc/py3/debian/9/amd64 stretch main
deb http://repo.saltstack.com/salt_rc/py3/debian/<os_version>/amd64 stretch main
The OSs that will be built for each RC release are the latest version of each OS on https://repo.saltstack.com

Available builds:

- Ubuntu 18
- Debian 9
- Redhat 7
- Windows

.. FreeBSD
Expand Down Expand Up @@ -97,9 +93,8 @@ the ``-M`` and ``-N`` flags:
Installing Using PyPI
=====================

Installing from the `source archive
<https://pypi.python.org/pypi?:action=display&name=salt&version=2019.2.0rc1>`_ on
`PyPI <https://pypi.python.org/pypi>`_ is fairly straightforward.
Installing from the source archive on `PyPI <https://pypi.python.org/pypi>`_
is fairly straightforward.

.. note::

Expand Down Expand Up @@ -134,6 +129,12 @@ First install the build dependencies.

Then install salt using the following command:

.. code-block:: bash
sudo pip install salt==<rc tag version>
For example for the 2019.2.0rc1 release:

.. code-block:: bash
sudo pip install salt==2019.2.0rc1

0 comments on commit 523c254

Please sign in to comment.