diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 60952e9c13..3e54afaea4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,6 +28,7 @@ variables: TEST_SCRIPTS: '/vagrant/lib/tests/scripts' DEBOPS_PLAYBOOKS: '/vagrant/ansible/playbooks' VAGRANT_DOTFILE_PATH: '/var/tmp/vagrant-dotfile-${CI_JOB_ID}' + JANE_DIFF_BASE_BRANCH: 'origin/stable-3.1' GIT_STRATEGY: 'clone' TERM: 'xterm' diff --git a/CHANGELOG.rst b/CHANGELOG.rst index aa57beeccf..cd41c1e317 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -18,10 +18,10 @@ You can read information about required changes between releases in the :ref:`upgrade_notes` documentation. -`debops master`_ - unreleased ------------------------------ +`debops stable-3.1`_ - unreleased +--------------------------------- -.. _debops master: https://github.com/debops/debops/compare/v3.1.0...master +.. _debops stable-3.1: https://github.com/debops/debops/compare/v3.1.0...stable-3.1 `debops v3.1.0`_ - 2023-11-29