diff options
Diffstat (limited to 'doc/source')
| -rw-r--r-- | doc/source/admin/image-building.rst | 3 | ||||
| -rw-r--r-- | doc/source/admin/kolla_api.rst | 2 | ||||
| -rw-r--r-- | doc/source/admin/template-override/ovs-dpdk.rst | 2 | ||||
| -rw-r--r-- | doc/source/ceph_versions.csv | 2 | ||||
| -rw-r--r-- | doc/source/contributor/contributing.rst | 4 | ||||
| -rw-r--r-- | doc/source/contributor/ptl-guide.rst | 34 | ||||
| -rw-r--r-- | doc/source/contributor/running-tests.rst | 14 | ||||
| -rw-r--r-- | doc/source/support_matrix.rst | 3 |
8 files changed, 23 insertions, 41 deletions
diff --git a/doc/source/admin/image-building.rst b/doc/source/admin/image-building.rst index 793367a92..ff0a4164b 100644 --- a/doc/source/admin/image-building.rst +++ b/doc/source/admin/image-building.rst @@ -38,6 +38,7 @@ There are following distros (bases) available for building images: - centos - debian +- rocky - ubuntu See the :ref:`support matrix <support-matrix-base-images>` for information on @@ -138,7 +139,7 @@ The ``kolla-build.conf`` file could look like this: [keystone-base] type = git location = https://opendev.org/openstack/keystone - reference = stable/mitaka + reference = stable/2025.2 [heat-base] type = local diff --git a/doc/source/admin/kolla_api.rst b/doc/source/admin/kolla_api.rst index aea5b81b0..2d0a17a0f 100644 --- a/doc/source/admin/kolla_api.rst +++ b/doc/source/admin/kolla_api.rst @@ -152,7 +152,7 @@ or off, such as the horizon container that looks for ``ENABLE_XXX`` variables where ``XXX`` is a horizon plugin name. These are generally defined in the container-specific ``extend_start.sh`` script, example for `horizon`_. -.. _horizon: https://github.com/openstack/kolla/blob/master/docker/horizon/extend_start.sh +.. _horizon: https://opendev.org/openstack/kolla/src/branch/master/docker/horizon/extend_start.sh Variables available in the containers ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/doc/source/admin/template-override/ovs-dpdk.rst b/doc/source/admin/template-override/ovs-dpdk.rst index cdd7d847c..73851a993 100644 --- a/doc/source/admin/template-override/ovs-dpdk.rst +++ b/doc/source/admin/template-override/ovs-dpdk.rst @@ -29,5 +29,5 @@ repository: .. code-block:: console - tools/build.py -t source --template-override contrib/template-override/ovs-dpdk.j2 ovsdpdk + kolla-build --template-override contrib/template-override/ovs-dpdk.j2 ovsdpdk diff --git a/doc/source/ceph_versions.csv b/doc/source/ceph_versions.csv index 85af90aa2..7511810a9 100644 --- a/doc/source/ceph_versions.csv +++ b/doc/source/ceph_versions.csv @@ -2,4 +2,4 @@ Distro,Ceph, ,Source,Release Rocky Linux,CentOS Storage SIG,Squid Ubuntu,Ubuntu,Squid -Debian,Debian,Pacific +Debian,Debian,Squid diff --git a/doc/source/contributor/contributing.rst b/doc/source/contributor/contributing.rst index 9d32291e0..821d6ab88 100644 --- a/doc/source/contributor/contributing.rst +++ b/doc/source/contributor/contributing.rst @@ -38,7 +38,7 @@ Meeting Agenda Whiteboard (etherpad) Keeping track of CI gate status, release status, stable backports, planning and feature development status. - https://etherpad.openstack.org/p/KollaWhiteBoard + https://etherpad.opendev.org/p/KollaWhiteBoard .. _channel logs: https://meetings.opendev.org/irclogs/%23openstack-kolla/ .. _meeting information: https://meetings.opendev.org/#Kolla_Team_Meeting @@ -72,7 +72,7 @@ Kolla family projects track tasks and bugs in Launchpad: If you're looking for some smaller, easier work item to pick up and get started on, search for the 'low-hanging-fruit' tag in the relevant project. -A more lightweight task tracking is done via etherpad - `Whiteboard <https://etherpad.openstack.org/p/KollaWhiteBoard>`__. +A more lightweight task tracking is done via etherpad - `Whiteboard <https://etherpad.opendev.org/p/KollaWhiteBoard>`__. Reporting a Bug ~~~~~~~~~~~~~~~ diff --git a/doc/source/contributor/ptl-guide.rst b/doc/source/contributor/ptl-guide.rst index 673314c95..6b445fcd5 100644 --- a/doc/source/contributor/ptl-guide.rst +++ b/doc/source/contributor/ptl-guide.rst @@ -23,31 +23,7 @@ New PTL * Get acquainted with the release schedule, bearing in mind that Kolla is a cycle-trailing project - * Example: https://releases.openstack.org/train/schedule.html - -Open Infrastructure Summit -========================== - -Ideally the Kolla PTL will be able to attend the summit. If not, try to arrange -for another member of the core team to represent the team. Good interaction -with the community at these events is crucial to encourage upstream -involvement, onboard new users, collect feedback and for the perceived health -of the project. - -* Create a summit planning etherpad and alert about it in the kolla IRC meeting - and openstack-discuss mailing list - - * Example: https://etherpad.openstack.org/p/kolla-train-summit - -* Gather ideas for forum sessions - - * Example: user feedback & roadmap, design sessions - -* Prepare the project update presentation. Enlist help of others - -* Prepare the on-boarding session materials. Enlist help of others - -* Represent and promote the project while at the summit + * Example: https://releases.openstack.org/gazpacho/schedule.html Project Team Gathering (PTG) ============================ @@ -57,10 +33,14 @@ Gathering (PTG). Alternatively, they may decide to host a virtual PTG at a different time if there is not a critical mass of contributors attending the PTG. +* Register the team for the PTG + +* Reserve slots via the ptgbot + * Create PTG planning etherpad and alert about it in the kolla IRC meeting and openstack-discuss mailing list - * Example: https://etherpad.openstack.org/p/kolla-train-ptg + * Example: https://etherpad.opendev.org/p/kolla-gazpacho-ptg * Run sessions at the PTG @@ -81,7 +61,7 @@ After Summit & PTG * Send session summaries to the openstack-discuss mailing list * Update the `Kolla whiteboard - <https://etherpad.openstack.org/p/KollaWhiteBoard>`__ with decided priorities + <https://etherpad.opendev.org/p/KollaWhiteBoard>`__ with decided priorities for the upcoming release cycle Day to Day diff --git a/doc/source/contributor/running-tests.rst b/doc/source/contributor/running-tests.rst index 88b13feac..87c62d393 100644 --- a/doc/source/contributor/running-tests.rst +++ b/doc/source/contributor/running-tests.rst @@ -31,11 +31,11 @@ See the `unit testing <https://wiki.openstack.org/wiki/Testing#Unit_Tests>`__ section of the Testing wiki page for more information. Following are some simple examples. -To run the Python 3.8 tests: +To run the Python 3.13 tests: .. code-block:: console - tox -e py38 + tox -e py313 To run the style tests: @@ -47,7 +47,7 @@ To run multiple tests separate items by commas: .. code-block:: console - tox -e py38,pep8 + tox -e py313,pep8 Running a subset of tests ------------------------- @@ -60,27 +60,27 @@ To run the tests located only in the ``kolla/tests`` directory: .. code-block:: console - tox -e py38 kolla.tests + tox -e py313 kolla.tests To run the tests of a specific file say ``kolla/tests/test_set_config.py``: .. code-block:: console - tox -e py38 test_set_config + tox -e py313 test_set_config To run the tests in the ``ConfigFileTest`` class in the ``kolla/tests/test_set_config.py`` file: .. code-block:: console - tox -e py38 test_set_config.ConfigFileTest + tox -e py313 test_set_config.ConfigFileTest To run the ``ConfigFileTest.test_delete_path_not_exists`` test method in the ``kolla/tests/test_set_config.py`` file: .. code-block:: console - tox -e py38 test_set_config.ConfigFileTest.test_delete_path_not_exists + tox -e py313 test_set_config.ConfigFileTest.test_delete_path_not_exists Coverage Report Generation -------------------------- diff --git a/doc/source/support_matrix.rst b/doc/source/support_matrix.rst index 31c67e70a..2cce5c99a 100644 --- a/doc/source/support_matrix.rst +++ b/doc/source/support_matrix.rst @@ -17,8 +17,9 @@ The following base container images are supported: ================== =============================== ================ Distribution Default base Default base tag ================== =============================== ================ -Rocky Linux quay.io/rockylinux/rockylinux 10 +Centos quay.io/centos/centos stream10 Debian Trixie debian trixie +Rocky Linux quay.io/rockylinux/rockylinux 10 Ubuntu Noble ubuntu 24.04 ================== =============================== ================ |