Browse Source

Clean up bitrot

Depends-On: https://review.opendev.org/c/windmill/windmill-config/+/797553
Change-Id: I12e7b603c9d4ae7364982044069e9ac7ac4d6034
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
changes/62/797462/5
Paul Belanger 11 months ago
parent
commit
12dd334b2e
  1. 21
      .zuul.yaml
  2. 2
      bindep.txt
  3. 1
      test-requirements.txt
  4. 16
      tests/playbooks/pre.yaml
  5. 3
      tox.ini

21
.zuul.yaml

@ -12,15 +12,12 @@
name: ansible-role-zuul
parent: ansible-role-zuul-base
- job:
name: ansible-role-zuul-fedora-latest
parent: ansible-role-zuul
nodeset: fedora-latest
- job:
name: ansible-role-zuul-ubuntu-bionic
parent: ansible-role-zuul
nodeset: ubuntu-bionic
vars:
zuul_pip_version: 3.19.1
# Testing for zuul_install_method: git
- job:
@ -32,11 +29,6 @@
zuul_git_update: false
zuul_install_method: git
- job:
name: ansible-role-zuul-src-fedora-latest
parent: ansible-role-zuul-src
nodeset: fedora-latest
- job:
name: ansible-role-zuul-src-ubuntu-bionic
parent: ansible-role-zuul-src
@ -44,19 +36,14 @@
- project:
templates:
- windmill-jobs-fedora-latest
- windmill-jobs-bionic
check:
jobs:
- ansible-role-zuul-fedora-latest
- ansible-role-zuul-ubuntu-bionic
- ansible-role-zuul-src-fedora-latest
- ansible-role-zuul-src-ubuntu-bionic
- ansible-role-zuul-src-ubuntu-bionic:
voting: false
- tox-linters
gate:
jobs:
- ansible-role-zuul-fedora-latest
- ansible-role-zuul-ubuntu-bionic
- ansible-role-zuul-src-fedora-latest
- ansible-role-zuul-src-ubuntu-bionic
- tox-linters

2
bindep.txt

@ -14,4 +14,4 @@ python3-setuptools [test]
# NOTE(pabelanger): This is because of a bug in zuul, when zuul-scheduler starts
# it will fail unless it cannot connect to zookeeper. However, zuul should be
# smart enough to try forever to connect.
zookeeperd [platform:dpkg]
zookeeperd [ansible platform:dpkg]

1
test-requirements.txt

@ -1,2 +1 @@
ansible-lint
hacking<0.11,>=0.10

16
tests/playbooks/pre.yaml

@ -26,3 +26,19 @@
dest: /etc/pip.conf
regexp: ^extra-index-url
state: absent
- name: Execute bindep role
include_role:
name: bindep
vars:
bindep_profile: ansible test
- name: Setup ensure-tox role
include_role:
name: ensure-tox
vars:
ensure_global_symlinks: true
- name: Use the latest version of pip
become: true
shell: python3 -m pip install -U pip

3
tox.ini

@ -35,9 +35,6 @@ whitelist_externals = bash
commands =
# PEP8 Lint Check
flake8
# Ansible Lint Check
bash -c "find . -not -path '*/\.*' -type f -regex '.*.y[a]?ml' -print0 | \
xargs -t -n1 -0 ansible-lint -x 106,306"
# Ansible Syntax Check
bash -c "find tests -type f -regex '.*.y[a]?ml' -print | xargs -t -n1 \
ansible-playbook --syntax-check -i tests/inventory \

Loading…
Cancel
Save