Browse Source

Clean up bitrot

Do the things we need to do to get our testing working.

Change-Id: Ia9898a2406c601f45b07714b46a7d44632e229e5
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
changes/69/797369/11
Paul Belanger 11 months ago
parent
commit
7b0af5bbfc
  1. 21
      .zuul.yaml
  2. 5
      bindep.txt
  3. 1
      requirements.txt
  4. 10
      tests/playbooks/pre.yaml
  5. 21
      tools/test-setup.sh

21
.zuul.yaml

@ -14,15 +14,12 @@
name: ansible-role-nodepool
parent: ansible-role-nodepool-base
- job:
name: ansible-role-nodepool-fedora-latest
parent: ansible-role-nodepool
nodeset: fedora-latest
- job:
name: ansible-role-nodepool-ubuntu-bionic
parent: ansible-role-nodepool
nodeset: ubuntu-bionic
vars:
nodepool_pip_version: 3.14.0
# Testing for nodepool_install_method: git
- job:
@ -34,11 +31,6 @@
nodepool_git_update: false
nodepool_install_method: git
- job:
name: ansible-role-nodepool-src-fedora-latest
parent: ansible-role-nodepool-src
nodeset: fedora-latest
- job:
name: ansible-role-nodepool-src-ubuntu-bionic
parent: ansible-role-nodepool-src
@ -56,19 +48,14 @@
- project:
templates:
- windmill-jobs-fedora-latest
- windmill-jobs-bionic
check:
jobs:
- ansible-role-nodepool-fedora-latest
- ansible-role-nodepool-ubuntu-bionic
- ansible-role-nodepool-src-fedora-latest
- ansible-role-nodepool-src-ubuntu-bionic
- ansible-role-nodepool-src-ubuntu-bionic:
voting: false
- tox-linters
gate:
jobs:
- ansible-role-nodepool-fedora-latest
- ansible-role-nodepool-ubuntu-bionic
- ansible-role-nodepool-src-fedora-latest
- ansible-role-nodepool-src-ubuntu-bionic
- tox-linters

5
bindep.txt

@ -1,6 +1,5 @@
# This is a cross-platform list tracking distribution packages needed by tests;
# see http://docs.openstack.org/infra/bindep/ for additional information.
docker.io [test platform:dpkg]
docker [test platform:fedora]
python-docker [test platform:dpkg]
python3-pip [test]
python3-setuptools [test]

1
requirements.txt

@ -1,2 +1 @@
ansible>=2.4.0
docker

10
tests/playbooks/pre.yaml

@ -20,6 +20,16 @@
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
- name: Execute test-setup role
include_role:
name: test-setup

21
tools/test-setup.sh

@ -1,21 +0,0 @@
#!/bin/bash -ex
# Copyright 2018 Red Hat, 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.
if ! [ $(getent group docker) ]; then
sudo groupadd docker
fi
sudo gpasswd -a ${USER} docker
sudo service docker restart
Loading…
Cancel
Save