Initial 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: I904833467206e6d4ff8882c5c02d30e915de24f8
2017-10-23 12:33:02 +00:00 · 2017-10-23 12:33:02 +00:00 · bb4ffbffab
commit bb4ffbffab
parent 4a224f899f
8 changed files with 115 additions and 55 deletions
--- a/bindep.txt
+++ b/bindep.txt
@ -3,39 +3,55 @@
 #
 # See the following for details:
 #  - http://docs.openstack.org/infra/bindep/
-#  - https://github.com/openstack-infra/bindep
+#  - https://git.openstack.org/cgit/openstack-infra/bindep
 #
 # Even if the role does not make use of this facility, it
 # is better to have this file empty, otherwise OpenStack-CI
 # will fall back to installing its default packages which
 # will potentially be detrimental to the tests executed.
+#
+# Note:
+# This file is maintained in the openstack-ansible-tests repository.
+# https://git.openstack.org/cgit/openstack/openstack-ansible-tests/tree/bindep.txt
+# If you need to remove or add extra dependencies, you should modify
+# the central file instead and once your change is accepted then update
+# this file as well. The purpose of this file is to ensure that Python and
+# Ansible have all their necessary binary requirements on the test host before
+# tox executes. Any binary requirements needed by services/roles should be
+# installed by those roles in their applicable package install tasks, not through
+# using this file.
+#

 # Base requirements for Ubuntu
-build-essential   [platform:dpkg]
+gcc               [platform:dpkg]
 git-core          [platform:dpkg]
 libssl-dev        [platform:dpkg]
 libffi-dev        [platform:dpkg]
 python2.7         [platform:dpkg]
+python-apt        [platform:dpkg]
 python-dev        [platform:dpkg]

-# Base requirements for CentOS
+# Base requirements for RPM distros
 gcc               [platform:rpm]
 gcc-c++           [platform:rpm]
 git               [platform:rpm]
-python-devel      [platform:rpm]
 libffi-devel      [platform:rpm]
-openssl-devel     [platform:rpm]
+openssl-devel     [platform:redhat]
+python-devel      [platform:rpm]
+python2-dnf       [platform:fedora]

 # For SELinux
-libselinux-python [platform:rpm]
+libselinux-python [platform:redhat]
+libsemanage-python [platform:redhat]

 # For SSL SNI support
 python-pyasn1               [platform:dpkg]
 python-openssl              [platform:dpkg]
-python-ndg-httpsclient      [platform:ubuntu]
-python2-pyasn1              [platform:rpm]
-python2-pyOpenSSL           [platform:rpm]
-python-ndg_httpsclient      [platform:rpm]
+python-ndg-httpsclient      [platform:ubuntu !platform:ubuntu-14]
+python2-pyasn1              [platform:redhat]
+pyOpenSSL                   [platform:redhat]
+python-ndg_httpsclient      [platform:redhat !platform:fedora]
+python2-ndg_httpsclient     [platform:fedora]

 # Required for compressing collected log files in CI
 gzip
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@ -70,7 +70,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 = '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
 # |version| and |release|, also used in various other places throughout the
--- 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 = '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
 # |version| and |release|, also used in various other places throughout the
--- a/run_tests.sh
+++ b/run_tests.sh
@ -12,54 +12,57 @@
 # 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.
+#
+# Note:
+# This file is maintained in the openstack-ansible-tests repository.
+# https://git.openstack.org/cgit/openstack/openstack-ansible-tests/tree/run_tests.sh
+# If you need to modify this file, update the one in the openstack-ansible-tests
+# repository and then update this file as well. The purpose of this file is to
+# prepare the host and then execute all the tox tests.
+#

-set -xeuo pipefail
+## Shell Opts ----------------------------------------------------------------
+set -xeu

-FUNCTIONAL_TEST=${FUNCTIONAL_TEST:-true}
+## Vars ----------------------------------------------------------------------

-# Install pip.
-if ! which pip; then
-  curl --silent --show-error --retry 5 \
-    https://bootstrap.pypa.io/get-pip.py | sudo python2.7
-fi
+export WORKING_DIR=${WORKING_DIR:-$(pwd)}

-# Install bindep and tox with pip.
-sudo pip install bindep tox
+## Main ----------------------------------------------------------------------

-# CentOS 7 requires two additional packages:
-#   redhat-lsb-core - for bindep profile support
-#   epel-release    - required to install python-ndg_httpsclient/python2-pyasn1
-if which yum; then
-    sudo yum -y install redhat-lsb-core epel-release
-fi
+source /etc/os-release || source /usr/lib/os-release

-# Get a list of packages to install with bindep. If packages need to be
-# installed, bindep exits with an exit code of 1.
-BINDEP_PKGS=$(bindep -b -f bindep.txt test || true)
-echo "Packages to install: ${BINDEP_PKGS}"
+install_pkg_deps() {
+    pkg_deps="git"

-# Install a list of OS packages provided by bindep.
-if which apt-get; then
-    sudo apt-get update
-    DEBIAN_FRONTEND=noninteractive \
-      sudo apt-get -q --option "Dpkg::Options::=--force-confold" \
-      --assume-yes install $BINDEP_PKGS
-elif which yum; then
-    # Don't run yum with an empty list of packages.
-    # It will fail and cause the script to exit with an error.
-    if [[ ${#BINDEP_PKGS} > 0 ]]; then
-      sudo yum install -y $BINDEP_PKGS
-    fi
-fi
+    case ${ID,,} in
+        centos|rhel) pkg_mgr_cmd="yum install -y" ;;
+        fedora) pkg_mgr_cmd="dnf -y install" ;;
+        ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;;
+        *) echo "unsupported distribution: ${ID,,}"; exit 1 ;;
+    esac

-# Loop through each tox environment and run tests.
-for tox_env in $(awk -F= '/envlist/ { gsub(",", " "); print $2 }' tox.ini); do
-  echo "Executing tox environment: ${tox_env}"
-  if [[ ${tox_env} == ansible-functional ]]; then
-    if ${FUNCTIONAL_TEST}; then
-      tox -e ${tox_env}
-    fi
+    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
-    tox -e ${tox_env}
+            git clone -b stable/ocata \
+                https://git.openstack.org/openstack/openstack-ansible-tests \
+                tests/common
        fi
-done
+    fi
+}
+
+install_pkg_deps
+
+git_clone_repo
+
+# start executing the main test script
+source tests/common/run_tests_common.sh
+
--- a/tests/ansible-role-requirements.yml
+++ b/tests/ansible-role-requirements.yml
@ -2,6 +2,10 @@
  src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
  scm: git
  version: origin/stable/ocata
+- name: ceph_client
+  src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
+  scm: git
+  version: origin/stable/ocata
 - name: pip_install
  src: https://git.openstack.org/openstack/openstack-ansible-pip_install
  scm: git
--- a/tests/inventory
+++ b/tests/inventory
@ -34,13 +34,20 @@ openstack1
 [nova_compute]

 [nova_conductor]
+openstack1

 [nova_console]

 [nova_scheduler]

 [nova_all:children]
+nova_api_metadata
 nova_api_os_compute
+nova_compute
+nova_conductor
+nova_console
+nova_scheduler
+nova_api_placement

 [keystone_all]
 openstack1
--- a/tests/os_sahara-overrides.yml
+++ b/tests/os_sahara-overrides.yml
@ -18,7 +18,7 @@ tempest_run: yes
 tempest_plugins:
  - name: sahara-tests
    repo: https://git.openstack.org/openstack/sahara-tests
-    branch: master
+    branch: 0.5.0

 tempest_test_whitelist:
  - sahara_tempest_plugin.tests.api
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@ -0,0 +1,26 @@
+---
+# 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_sahara
+    check:
+      jobs:
+        - openstack-ansible-linters
+        - openstack-ansible-functional-centos-7-nv
+        - openstack-ansible-functional-ubuntu-xenial
+    gate:
+      jobs:
+        - openstack-ansible-linters
+        - openstack-ansible-functional-ubuntu-xenial