From 828a34d486173e098c469d3764d38f699eb094dd Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Wed, 21 Apr 2021 17:14:22 +0900 Subject: [PATCH] DevStack job with heat-translator/tosca-parser master Change-Id: I18c5adeddeb17dc78264d598274bf15ec3b2d729 --- .zuul.yaml | 10 ++++++++++ devstack/plugin.sh | 9 +++++++++ devstack/settings | 8 ++++++++ 3 files changed, 27 insertions(+) diff --git a/.zuul.yaml b/.zuul.yaml index 7706ac552..420483831 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -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 diff --git a/devstack/plugin.sh b/devstack/plugin.sh index f0b1c95d8..c559a05b0 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -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" diff --git a/devstack/settings b/devstack/settings index f0e51d501..38eba585b 100644 --- a/devstack/settings +++ b/devstack/settings @@ -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