diff --git a/.gitreview b/.gitreview index 06f18c3..013b858 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=review.opendev.org port=29418 project=openstack/openstack-chef.git +defaultbranch=stable/train diff --git a/Berksfile b/Berksfile index 785e8b8..234b739 100644 --- a/Berksfile +++ b/Berksfile @@ -21,14 +21,16 @@ solver :ruby, :required if Dir.exist?("../cookbook-openstack-#{cookbook}") cookbook "openstack-#{cookbook}", path: "../cookbook-openstack-#{cookbook}" else - cookbook "openstack-#{cookbook}", git: "https://opendev.org/openstack/cookbook-openstack-#{cookbook}" + cookbook "openstack-#{cookbook}", git: "https://opendev.org/openstack/cookbook-openstack-#{cookbook}", + branch: 'stable/train' end end if Dir.exist?('../cookbook-openstackclient') cookbook 'openstackclient', path: '../cookbook-openstackclient' else - cookbook 'openstackclient', git: 'https://opendev.org/openstack/cookbook-openstackclient' + cookbook 'openstackclient', git: 'https://opendev.org/openstack/cookbook-openstackclient', + branch: 'stable/train' end cookbook 'openstack_test', path: 'test/cookbooks/openstack_test' diff --git a/doc/requirements.txt b/doc/requirements.txt index e1aaca8..25135b3 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -4,5 +4,5 @@ # this is required for the docs build jobs sphinx>=2.0.0,!=2.1.0 # BSD -openstackdocstheme>=2.2.1 # Apache-2.0 -reno>=3.1.0 # Apache-2.0 +openstackdocstheme>=1.31.1 # Apache-2.0 +reno>=2.11.3 # Apache-2.0