Refactor jobs to support pip / git installation testing

Because we want users to support both pip / git install methods,
refactor testing to support the testing of that.

Change-Id: I633aafce865c7d5f3b2a28aa6c5b47dc449e00ea
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
changes/81/562881/2
Paul Belanger 5 years ago
parent 071f933d3e
commit e79264d4f1
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
  1. 46
      .zuul.d/jobs.yaml
  2. 26
      .zuul.d/project-templates.yaml
  3. 3
      .zuul.d/projects.yaml
  4. 10
      tests/extra-vars/git.yaml
  5. 5
      tests/extra-vars/pip.yaml
  6. 2
      tests/playbooks/run.yaml

@ -22,22 +22,62 @@
- openstack-infra/shade
- openstack-infra/zuul
# Testing for install_method: pip
- job:
name: windmill-centos-7
name: windmill
parent: windmill-base
vars:
windmill_extra_vars_file: tests/extra-vars/pip.yaml
- job:
name: windmill-centos-7
parent: windmill
nodeset: centos-7
- job:
name: windmill-fedora-27
parent: windmill-base
parent: windmill
nodeset: fedora-27
- job:
name: windmill-ubuntu-bionic
parent: windmill-base
parent: windmill
nodeset: ubuntu-bionic
- job:
name: windmill-ubuntu-xenial
parent: windmill
nodeset: ubuntu-xenial
# Testing for install_method: git
- job:
name: windmill-src
parent: windmill-base
required-projects:
- openstack/diskimage-builder
- openstack-infra/gear
- openstack-infra/nodepool
- openstack-infra/shade
- openstack-infra/zuul
vars:
windmill_extra_vars_file: tests/extra-vars/git.yaml
- job:
name: windmill-src-centos-7
parent: windmill-src
nodeset: centos-7
- job:
name: windmill-src-fedora-27
parent: windmill-src
nodeset: fedora-27
- job:
name: windmill-src-ubuntu-bionic
parent: windmill-src
nodeset: ubuntu-bionic
- job:
name: windmill-src-ubuntu-xenial
parent: windmill-src
nodeset: ubuntu-xenial

@ -44,3 +44,29 @@
jobs:
- windmill-ubuntu-xenial:
voting: false
- project-template:
name: windmill-jobs-src-fedora-27
check:
jobs:
- windmill-src-fedora-27
gate:
queue: windmill
jobs:
- windmill-src-fedora-27
- project-template:
name: windmill-jobs-src-bionic
check:
jobs:
- windmill-src-ubuntu-bionic
- project-template:
name: windmill-jobs-src-xenial
check:
jobs:
- windmill-src-ubuntu-xenial
gate:
queue: windmill
jobs:
- windmill-src-ubuntu-xenial

@ -4,3 +4,6 @@
- windmill-jobs-fedora-27
- windmill-jobs-bionic
- windmill-jobs-xenial
- windmill-jobs-src-fedora-27
- windmill-jobs-src-bionic
- windmill-jobs-src-xenial

@ -2,10 +2,20 @@
# gate, we don't want our roles to update git after we pushed the repos
# from zuul-executors.
diskimage_builder_git_update: false
diskimage_builder_install_method: git
gear_git_update: false
gear_install_method: git
nodepool_git_update: false
nodepool_install_method: git
shade_git_update: false
shade_install_method: git
zuul_git_update: false
zuul_install_method: git
# NOTE(pabelanger): In the gate, we want to create a zuul-test user /
# group as zuul already exists on our images.
zuul_user_name: zuul-test

@ -0,0 +1,5 @@
# NOTE(pabelanger): In the gate, we want to create a zuul-test user /
# group as zuul already exists on our images.
zuul_user_name: zuul-test
zuul_user_group: zuul-test
zuul_user_home: /var/lib/zuul

@ -8,7 +8,7 @@
- name: Run ansible-playbook for site.yaml
args:
chdir: "{{ windmill_src_dir }}"
shell: tox -evenv -- ansible-playbook -i inventory/testing/hosts playbooks/site.yaml --extra-vars "@tests/extra-vars.yaml"
shell: "tox -evenv -- ansible-playbook -i inventory/testing/hosts playbooks/site.yaml -e @{{ windmill_extra_vars_file }}"
- name: Run ansible-playbook for prove.yaml
args:

Loading…
Cancel
Save