Add zuul v3 support/jobs

Setup support for running the linters and functional tests under zuulv3.

Depends-On: I6490979d208938634373c08d164461e9d5d1150a
Change-Id: I04d1d38b6fb80400ffbe38e803f760b99eadf232
This commit is contained in:
Michael Johnson 2017-10-24 10:01:17 -07:00 committed by German Eichberger
parent 7c1b7d616e
commit b9d8aa3fd6
5 changed files with 57 additions and 22 deletions

View File

@ -69,7 +69,9 @@ target_name = 'openstack-ansible-' + role_name
title = 'OpenStack-Ansible Documentation: ' + role_name + 'role' title = 'OpenStack-Ansible Documentation: ' + role_name + 'role'
# The link to the browsable source code (for the left hand menu) # The link to the browsable source code (for the left hand menu)
oslosphinx_cgit_link = 'http://git.openstack.org/cgit/openstack/' + target_name oslosphinx_cgit_link = (
"https://git.openstack.org/cgit/openstack/{}".format(target_name)
)
# The version info for the project you're documenting, acts as replacement for # The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the # |version| and |release|, also used in various other places throughout the

View File

@ -65,7 +65,9 @@ target_name = 'openstack-ansible-' + role_name
title = 'OpenStack-Ansible Release Notes: ' + role_name + 'role' title = 'OpenStack-Ansible Release Notes: ' + role_name + 'role'
# The link to the browsable source code (for the left hand menu) # The link to the browsable source code (for the left hand menu)
oslosphinx_cgit_link = 'http://git.openstack.org/cgit/openstack/' + target_name oslosphinx_cgit_link = (
"https://git.openstack.org/cgit/openstack/{}".format(target_name)
)
# The version info for the project you're documenting, acts as replacement for # The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the # |version| and |release|, also used in various other places throughout the

View File

@ -49,24 +49,11 @@ install_pkg_deps() {
eval sudo $pkg_mgr_cmd $pkg_deps eval sudo $pkg_mgr_cmd $pkg_deps
} }
git_clone_repo() {
if [[ ! -d tests/common ]]; then
# The tests repo doesn't need a clone, we can just
# symlink it.
if [[ "$(basename ${WORKING_DIR})" == "openstack-ansible-tests" ]]; then
ln -s ${WORKING_DIR} ${WORKING_DIR}/tests/common
else
git clone \
https://git.openstack.org/openstack/openstack-ansible-tests \
tests/common
fi
fi
}
install_pkg_deps install_pkg_deps
git_clone_repo # Clone the tests repo for access to the common test script
source tests/tests-repo-clone.sh
# start executing the main test script # Execute the common test script
source tests/common/run_tests_common.sh source tests/common/run_tests_common.sh

View File

@ -33,6 +33,7 @@ set -e
export TESTING_HOME=${TESTING_HOME:-$HOME} export TESTING_HOME=${TESTING_HOME:-$HOME}
export WORKING_DIR=${WORKING_DIR:-$(pwd)} export WORKING_DIR=${WORKING_DIR:-$(pwd)}
export CLONE_UPGRADE_TESTS=${CLONE_UPGRADE_TESTS:-no} export CLONE_UPGRADE_TESTS=${CLONE_UPGRADE_TESTS:-no}
export ZUUL_TESTS_CLONE_LOCATION="/home/zuul/src/git.openstack.org/openstack/openstack-ansible-tests"
## Functions ----------------------------------------------------------------- ## Functions -----------------------------------------------------------------
@ -52,7 +53,11 @@ EOF
# If zuul-cloner is present, use it so that we # If zuul-cloner is present, use it so that we
# also include any dependent patches from the # also include any dependent patches from the
# tests repo noted in the commit message. # tests repo noted in the commit message.
if [[ -x /usr/zuul-env/bin/zuul-cloner ]]; then # We only want to use zuul-cloner if we detect
# zuul v2 running, so we check for the presence
# of the ZUUL_REF environment variable.
# ref: http://git.openstack.org/cgit/openstack-infra/zuul/tree/zuul/ansible/filter/zuul_filters.py?h=feature/zuulv3#n17
if [[ -x /usr/zuul-env/bin/zuul-cloner ]] && [[ "${ZUUL_REF:-none}" != "none" ]]; then
# Prepare the clonemap for zuul-cloner to use # Prepare the clonemap for zuul-cloner to use
create_tests_clonemap create_tests_clonemap
@ -74,14 +79,28 @@ if [[ -x /usr/zuul-env/bin/zuul-cloner ]]; then
elif [[ ! -d tests/common ]]; then elif [[ ! -d tests/common ]]; then
# The tests repo doesn't need a clone, we can just # The tests repo doesn't need a clone, we can just
# symlink it. # symlink it. As zuul v3 clones into a folder called
if [[ "$(basename ${WORKING_DIR})" == "openstack-ansible-tests" ]]; then # 'workspace' we have to use one of its environment
# variables to determine the project name.
if [[ "${ZUUL_SHORT_PROJECT_NAME:-none}" == "openstack-ansible-tests" ]] ||\
[[ "$(basename ${WORKING_DIR})" == "openstack-ansible-tests" ]]; then
ln -s ${WORKING_DIR} ${WORKING_DIR}/tests/common ln -s ${WORKING_DIR} ${WORKING_DIR}/tests/common
# In zuul v3 any dependent repository is placed into
# /home/zuul/src/git.openstack.org, so we check to see
# if there is a tests checkout there already. If so, we
# symlink that and use it.
elif [[ -d "${ZUUL_TESTS_CLONE_LOCATION}" ]]; then
ln -s "${ZUUL_TESTS_CLONE_LOCATION}" ${WORKING_DIR}/tests/common
# Otherwise we're clearly not in zuul or using a previously setup
# repo in some way, so just clone it from upstream.
else else
git clone \ git clone \
https://git.openstack.org/openstack/openstack-ansible-tests \ https://git.openstack.org/openstack/openstack-ansible-tests \
${WORKING_DIR}/tests/common ${WORKING_DIR}/tests/common
fi fi
fi fi
# If this test set includes an upgrade test, the # If this test set includes an upgrade test, the
@ -92,7 +111,7 @@ fi
# tests repo are not supported. # tests repo are not supported.
if [[ "${CLONE_UPGRADE_TESTS}" == "yes" ]]; then if [[ "${CLONE_UPGRADE_TESTS}" == "yes" ]]; then
if [[ ! -d "${WORKING_DIR}/tests/common/previous" ]]; then if [[ ! -d "${WORKING_DIR}/tests/common/previous" ]]; then
git clone -b stable/ocata \ git clone -b stable/pike \
https://git.openstack.org/openstack/openstack-ansible-tests \ https://git.openstack.org/openstack/openstack-ansible-tests \
${WORKING_DIR}/tests/common/previous ${WORKING_DIR}/tests/common/previous
fi fi

25
zuul.d/project.yaml Normal file
View File

@ -0,0 +1,25 @@
---
# Copyright 2017, Rackspace US, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
- project:
name: openstack/openstack-ansible-os_octavia
check:
jobs:
- openstack-ansible-linters
- openstack-ansible-functional-ubuntu-xenial
gate:
jobs:
- openstack-ansible-linters
- openstack-ansible-functional-ubuntu-xenial