Browse Source

Merge "Add dogpile.cache master to the -src tests"

tags/3.5.0
Zuul 10 months ago
parent
commit
bf5a206c08
3 changed files with 22 additions and 5 deletions
  1. +5
    -4
      .zuul.yaml
  2. +14
    -1
      devstack/plugin.sh
  3. +3
    -0
      devstack/settings

+ 5
- 4
.zuul.yaml View File

@@ -74,10 +74,11 @@
parent: nodepool-functional-base
run: playbooks/nodepool-functional-py35-src/run.yaml
required-projects:
- openstack-infra/glean
- openstack-infra/nodepool
- openstack/diskimage-builder
- openstack/openstacksdk
- name: github.com/sqlalchemy/dogpile.cache
- name: openstack-infra/glean
- name: openstack-infra/nodepool
- name: openstack/diskimage-builder
- name: openstack/openstacksdk

- job:
name: nodepool-functional-py35-src

+ 14
- 1
devstack/plugin.sh View File

@@ -42,7 +42,6 @@ function install_glean {
fi
}


function install_openstacksdk {
if use_library_from_git "openstacksdk"; then
git_clone_by_name "openstacksdk"
@@ -50,6 +49,19 @@ function install_openstacksdk {
fi
}

function install_dogpile_cache {
if use_library_from_git "dogpile.cache"; then
GITREPO["dogpile.cache"]=$DOGPILE_CACHE_REPO_URL
GITDIR["dogpile.cache"]=$DEST/dogpile.cache
GITBRANCH["dogpile.cache"]=$DOGPILE_CACHE_REPO_REF


git_clone_by_name "dogpile.cache"
$NODEPOOL_INSTALL/bin/pip install $DEST/dogpile.cache
fi
}


# Install nodepool code
function install_nodepool {
VENV="virtualenv -p python3"
@@ -64,6 +76,7 @@ function install_nodepool {
# in the -src job we don't re-install from the requirement.
# We should make this more resilient, probably using install-siblings.
install_openstacksdk
install_dogpile_cache
$NODEPOOL_INSTALL/bin/pbr freeze
}


+ 3
- 0
devstack/settings View File

@@ -23,6 +23,9 @@ DISKIMAGE_BUILDER_REPO_REF=${DISKIMAGE_BUILDER_REPO_REF:-master}
GLEAN_REPO_URL=${GLEAN_REPO_URL:-https://git.openstack.org/openstack/glean}
GLEAN_REPO_REF=${GLEAN_REPO_REF:-master}

DOGPILE_CACHE_REPO_URL=${DOGPILE_CACHE_REPO_URL:-https://github.com/sqlalchemy/dogpile.git}
DOGPILE_CACHE_REPO_REF=${DOGPILE_CACHE_REPO_REF:-master}

enable_service geard
enable_service statsd
enable_service nodepool-launcher

Loading…
Cancel
Save