summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-22 21:15:25 +0000
committerGerrit Code Review <review@openstack.org>2019-01-22 21:15:25 +0000
commitbf5a206c0889b8d71214ca6702575d60695f3d79 (patch)
tree470b00b227f1bc2abf2815d1bb27846bc7dc870e
parent1edeb2fe3b5c3e16dd78b78f171f634608fc5b66 (diff)
parent515255f7a80c691f33940262343d913568ea9964 (diff)
Merge "Add dogpile.cache master to the -src tests"
-rw-r--r--.zuul.yaml9
-rw-r--r--devstack/plugin.sh15
-rw-r--r--devstack/settings3
3 files changed, 22 insertions, 5 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 61b89ea..efd99e2 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -74,10 +74,11 @@
74 parent: nodepool-functional-base 74 parent: nodepool-functional-base
75 run: playbooks/nodepool-functional-py35-src/run.yaml 75 run: playbooks/nodepool-functional-py35-src/run.yaml
76 required-projects: 76 required-projects:
77 - openstack-infra/glean 77 - name: github.com/sqlalchemy/dogpile.cache
78 - openstack-infra/nodepool 78 - name: openstack-infra/glean
79 - openstack/diskimage-builder 79 - name: openstack-infra/nodepool
80 - openstack/openstacksdk 80 - name: openstack/diskimage-builder
81 - name: openstack/openstacksdk
81 82
82- job: 83- job:
83 name: nodepool-functional-py35-src 84 name: nodepool-functional-py35-src
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 80fafe7..1373b4e 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -42,7 +42,6 @@ function install_glean {
42 fi 42 fi
43} 43}
44 44
45
46function install_openstacksdk { 45function install_openstacksdk {
47 if use_library_from_git "openstacksdk"; then 46 if use_library_from_git "openstacksdk"; then
48 git_clone_by_name "openstacksdk" 47 git_clone_by_name "openstacksdk"
@@ -50,6 +49,19 @@ function install_openstacksdk {
50 fi 49 fi
51} 50}
52 51
52function install_dogpile_cache {
53 if use_library_from_git "dogpile.cache"; then
54 GITREPO["dogpile.cache"]=$DOGPILE_CACHE_REPO_URL
55 GITDIR["dogpile.cache"]=$DEST/dogpile.cache
56 GITBRANCH["dogpile.cache"]=$DOGPILE_CACHE_REPO_REF
57
58
59 git_clone_by_name "dogpile.cache"
60 $NODEPOOL_INSTALL/bin/pip install $DEST/dogpile.cache
61 fi
62}
63
64
53# Install nodepool code 65# Install nodepool code
54function install_nodepool { 66function install_nodepool {
55 VENV="virtualenv -p python3" 67 VENV="virtualenv -p python3"
@@ -64,6 +76,7 @@ function install_nodepool {
64 # in the -src job we don't re-install from the requirement. 76 # in the -src job we don't re-install from the requirement.
65 # We should make this more resilient, probably using install-siblings. 77 # We should make this more resilient, probably using install-siblings.
66 install_openstacksdk 78 install_openstacksdk
79 install_dogpile_cache
67 $NODEPOOL_INSTALL/bin/pbr freeze 80 $NODEPOOL_INSTALL/bin/pbr freeze
68} 81}
69 82
diff --git a/devstack/settings b/devstack/settings
index 1308aa1..74473e7 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -23,6 +23,9 @@ DISKIMAGE_BUILDER_REPO_REF=${DISKIMAGE_BUILDER_REPO_REF:-master}
23GLEAN_REPO_URL=${GLEAN_REPO_URL:-https://git.openstack.org/openstack/glean} 23GLEAN_REPO_URL=${GLEAN_REPO_URL:-https://git.openstack.org/openstack/glean}
24GLEAN_REPO_REF=${GLEAN_REPO_REF:-master} 24GLEAN_REPO_REF=${GLEAN_REPO_REF:-master}
25 25
26DOGPILE_CACHE_REPO_URL=${DOGPILE_CACHE_REPO_URL:-https://github.com/sqlalchemy/dogpile.git}
27DOGPILE_CACHE_REPO_REF=${DOGPILE_CACHE_REPO_REF:-master}
28
26enable_service geard 29enable_service geard
27enable_service statsd 30enable_service statsd
28enable_service nodepool-launcher 31enable_service nodepool-launcher