From ed224c54a6010871494dd89fb3cd4d83a840c6cf Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Tue, 17 Oct 2017 17:43:32 +0100 Subject: [PATCH] Initial OSA zuul v3 role jobs This patch implements an initial set of jobs intended to match the current job execution method. It does not intend to improve how the jobs are executed - only to replicate what is currently in openstack-infra/openstack-zuul-jobs and provide the platform to iterate on. Change-Id: If86f31a6ff188c57c5981dcf9eddc26af7101b25 --- doc/source/conf.py | 4 ++- releasenotes/source/conf.py | 4 ++- run_tests.sh | 20 +++-------- tests/tests-repo-clone.sh | 24 +++++++++++-- zuul.d/jobs.yaml | 67 +++++++++++++++++++++++++++++++++++++ zuul.d/project.yaml | 32 ++++++++++++++++++ 6 files changed, 130 insertions(+), 21 deletions(-) create mode 100644 zuul.d/jobs.yaml create mode 100644 zuul.d/project.yaml diff --git a/doc/source/conf.py b/doc/source/conf.py index 30503a5..e8fb4bf 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -69,7 +69,9 @@ target_name = 'openstack-ansible-' + role_name title = 'OpenStack-Ansible Documentation: ' + role_name + 'role' # The link to the browsable source code (for the left hand menu) -oslosphinx_cgit_link = 'https://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 # |version| and |release|, also used in various other places throughout the diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 0cc8234..430b0fd 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -65,7 +65,9 @@ target_name = 'openstack-ansible-' + role_name title = 'OpenStack-Ansible Release Notes: ' + role_name + 'role' # The link to the browsable source code (for the left hand menu) -oslosphinx_cgit_link = 'https://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 # |version| and |release|, also used in various other places throughout the diff --git a/run_tests.sh b/run_tests.sh index e8f6f3a..d9dacfb 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -49,24 +49,12 @@ install_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 the host distro package dependencies 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 diff --git a/tests/tests-repo-clone.sh b/tests/tests-repo-clone.sh index 39efbb1..3e4ffd6 100755 --- a/tests/tests-repo-clone.sh +++ b/tests/tests-repo-clone.sh @@ -33,6 +33,7 @@ set -e export TESTING_HOME=${TESTING_HOME:-$HOME} export WORKING_DIR=${WORKING_DIR:-$(pwd)} export CLONE_UPGRADE_TESTS=${CLONE_UPGRADE_TESTS:-no} +export ZUUL_TESTS_CLONE_LOCATION="/home/zuul/src/git.openstack.org/openstack/openstack-ansible-tests" ## Functions ----------------------------------------------------------------- @@ -52,7 +53,11 @@ EOF # If zuul-cloner is present, use it so that we # also include any dependent patches from the # 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 create_tests_clonemap @@ -74,9 +79,22 @@ if [[ -x /usr/zuul-env/bin/zuul-cloner ]]; then elif [[ ! -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 + # symlink it. As zuul v3 clones into a folder called + # '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 + + # 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 git clone \ https://git.openstack.org/openstack/openstack-ansible-tests \ diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml new file mode 100644 index 0000000..ef8084f --- /dev/null +++ b/zuul.d/jobs.yaml @@ -0,0 +1,67 @@ +--- +# 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. + +- job: + name: openstack-ansible-dir-ubuntu-xenial + parent: openstack-ansible-functional + nodeset: ubuntu-xenial + vars: + tox_env: dir + +- job: + name: openstack-ansible-dir-centos-7 + parent: openstack-ansible-functional + nodeset: centos-7 + vars: + tox_env: dir + +- job: + name: openstack-ansible-dir-opensuse-423 + parent: openstack-ansible-functional + nodeset: opensuse-423 + vars: + tox_env: dir + +- job: + name: openstack-ansible-btrfs-ubuntu-xenial + parent: openstack-ansible-functional + nodeset: ubuntu-xenial + voting: false + vars: + tox_env: btrfs + +- job: + name: openstack-ansible-machinectl-ubuntu-xenial + parent: openstack-ansible-functional + nodeset: ubuntu-xenial + voting: false + vars: + tox_env: mnctl + +- job: + name: openstack-ansible-overlayfs-ubuntu-xenial + parent: openstack-ansible-functional + nodeset: ubuntu-xenial + voting: false + vars: + tox_env: ofs + +- job: + name: openstack-ansible-zfs-ubuntu-xenial + parent: openstack-ansible-functional + nodeset: ubuntu-xenial + voting: false + vars: + tox_env: zfs diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml new file mode 100644 index 0000000..9ab556d --- /dev/null +++ b/zuul.d/project.yaml @@ -0,0 +1,32 @@ +--- +# 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-lxc_container_create + check: + jobs: + - openstack-ansible-dir-ubuntu-xenial + - openstack-ansible-dir-centos-7 + - openstack-ansible-dir-opensuse-423 + - openstack-ansible-btrfs-ubuntu-xenial + - openstack-ansible-machinectl-ubuntu-xenial + - openstack-ansible-overlayfs-ubuntu-xenial + - openstack-ansible-zfs-ubuntu-xenial + gate: + queue: openstack-ansible + jobs: + - openstack-ansible-dir-ubuntu-xenial + - openstack-ansible-dir-centos-7 + - openstack-ansible-dir-opensuse-423