From 24e1e538d108a74a2c70a521b34a51226a6ec608 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Thu, 23 Mar 2017 14:41:42 +0800 Subject: [PATCH] Update test-requirements.txt This patch brings it in line with the latest global requirements. By being in line with global requirements, this is a more accurate list with respect to how things are actually tested in the gate. The following links[0][1][2] show the latest reno, oslosphinx, sphinx packages. [0]https://github.com/openstack/requirements/blob/master/global-requirements.txt#L263 [1]https://github.com/openstack/requirements/blob/master/global-requirements.txt#L372 [2]https://github.com/openstack/requirements/blob/master/global-requirements.txt#L395 Change-Id: Id8155c6879599ce6b6440475c8fc6985374d9799 --- manifests/deps.pp | 4 ++++ test-requirements.txt | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/manifests/deps.pp b/manifests/deps.pp index 8defa5d..19bc0bd 100644 --- a/manifests/deps.pp +++ b/manifests/deps.pp @@ -24,6 +24,10 @@ class ec2api::deps { ~> Service<| tag == 'ec2api-service' |> ~> anchor { 'ec2api::service::end': } + # all db settings should be applied and all packages should be installed + # before dbsync starts + Oslo::Db<||> -> Anchor['ec2api::dbsync::begin'] + # policy config should occur in the config block also. Anchor['ec2api::config::begin'] -> Openstacklib::Policy::Base<||> diff --git a/test-requirements.txt b/test-requirements.txt index baa2346..1ea50a8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,5 +1,7 @@ -# this is required for the docs build jobs -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 -oslosphinx>=2.5.0 # Apache-2.0 +# This is required for the docs build jobs +sphinx>=1.5.1 # BSD +oslosphinx>=4.7.0 # Apache-2.0 + +# This is required for the releasenotes build jobs # FIXME: reno is manually pinned to !=2.0.0 because of bug #1651995 -reno>=0.1.1,!=2.0.0 # Apache-2.0 +reno>=1.8.0,!=2.0.0 # Apache-2.0