Browse Source

Merge "DevStack job with heat-translator/tosca-parser master"

changes/45/773845/24
Zuul 2 months ago
committed by Gerrit Code Review
parent
commit
ccbfe08ecb
3 changed files with 27 additions and 0 deletions
  1. +10
    -0
      .zuul.yaml
  2. +9
    -0
      devstack/plugin.sh
  3. +8
    -0
      devstack/settings

+ 10
- 0
.zuul.yaml View File

@ -456,6 +456,15 @@
- ^releasenotes/.*$
- ^contrib/.*$
- job:
name: tacker-functional-devstack-multinode-libs-master
parent: tacker-functional-devstack-multinode-legacy
description: |
devstack-based functional tests with libs from the master branch
required-projects:
- openstack/heat-translator
- openstack/tosca-parser
- project:
templates:
- check-requirements
@ -470,3 +479,4 @@
- tacker-functional-devstack-multinode-sol
- tacker-functional-devstack-multinode-sol-separated-nfvo
- tacker-functional-devstack-multinode-sol-kubernetes
- tacker-functional-devstack-multinode-libs-master

+ 9
- 0
devstack/plugin.sh View File

@ -24,6 +24,15 @@ if is_service_enabled tacker; then
#install_package_local_repo heat-translator
#. $DEST/tacker/devstack/lib/download_upper_consts
if use_library_from_git heat-translator; then
git_clone_by_name heat-translator
setup_dev_lib heat-translator
fi
if use_library_from_git tosca-parser; then
git_clone_by_name tosca-parser
setup_dev_lib tosca-parser
fi
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
# Configure after the other layer 1 and 2 services have been configured
echo_summary "Configuring Tacker"


+ 8
- 0
devstack/settings View File

@ -3,6 +3,14 @@ USE_BARBICAN=True
KUBERNETES_VIM=${KUBERNETES_VIM:-False}
IS_ZUUL_FT=${IS_ZUUL_FT:-False}
GITREPO["heat-translator"]=${HEAT_TRANSLATOR_REPO:-${GIT_BASE}/openstack/heat-translator.git}
GITBRANCH["heat-translator"]=${HEAT_TRANSLATOR_BRANCH:-$TARGET_BRANCH}
GITDIR["heat-translator"]=$DEST/heat-translator
GITREPO["tosca-parser"]=${TOSCA_PARSER_REPO:-${GIT_BASE}/openstack/tosca-parser.git}
GITBRANCH["tosca-parser"]=${TOSCA_PARSER_BRANCH:-$TARGET_BRANCH}
GITDIR["tosca-parser"]=$DEST/tosca-parser
if [ "${TACKER_MODE}" == "all" -o "${IS_ZUUL_FT}" == "True" ]; then
MGMT_PHYS_NET=${MGMT_PHYS_NET:-mgmtphysnet0}
# br-infra is created by devstack multi node job


Loading…
Cancel
Save