Skip to content

Commit

Permalink
use new tox-lsr plugin
Browse files Browse the repository at this point in the history
Remove the shared scripts and instead use the new tox-lsr plugin.
  • Loading branch information
richm committed Dec 17, 2020
1 parent 6186a14 commit 0d6ae71
Show file tree
Hide file tree
Showing 17 changed files with 39 additions and 1,214 deletions.
7 changes: 6 additions & 1 deletion .ansible-lint
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
---
skip_list:
- '602'
- '106'
- '208'
- '301' # Commands should not change things if nothing needs doing
- '305' # Use shell only when shell functionality is required
- '306'
- '403'
- '502'
- '602'
55 changes: 29 additions & 26 deletions .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
name: tox
on: # yamllint disable-line rule:truthy
- pull_request
env:
TOX_LSR: "git+https://github.com/linux-system-roles/[email protected]"
LSR_ANSIBLES: 'ansible==2.7.* ansible==2.8.* ansible==2.9.*'
LSR_MSCENARIOS: default
# LSR_EXTRA_PACKAGES: libdbus-1-dev
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
jobs:
python:
runs-on: ubuntu-latest
Expand All @@ -15,15 +21,14 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.pyver }}
- name: Install platform dependencies
run: |
set -euxo pipefail
.travis/preinstall
- name: Install pip, tox, python dependencies
- name: Install platform dependencies, python, tox, tox-lsr
run: |
set -euxo pipefail
python -m pip install --upgrade pip
pip install tox
sudo apt-get update
sudo apt-get install git
pip install "$TOX_LSR"
lsr_ci_preinstall
- name: Run tox tests
run: |
set -euxo pipefail
Expand All @@ -35,40 +40,38 @@ jobs:
37) toxenvs="${toxenvs},coveralls,custom" ;;
38) toxenvs="${toxenvs},coveralls,custom" ;;
esac
TOXENV="$toxenvs" .travis/runtox
env:
LSR_ANSIBLES: 'ansible==2.7.* ansible==2.8.* ansible==2.9.*'
LSR_MSCENARIOS: default
TOXENV="$toxenvs" lsr_ci_runtox
python-26:
runs-on: ubuntu-16.04
env:
PY26URL: https://storage.googleapis.com/travis-ci-language-archives/python/binaries/ubuntu/14.04/x86_64/python-2.6.tar.bz2
PY26TARFILE: "python-2.6.tar.bz2"
PY26VENVPATH: "/home/travis/virtualenv/python2.6"
VIRTUAL_ENV_DISABLE_PROMPT: "true"
steps:
- name: checkout PR
uses: actions/checkout@v2
- name: Install python, dependencies
run: |
set -euo pipefail
curl -sSf --retry 5 -o python-2.6.tar.bz2 ${PY26URL}
sudo tar xjf python-2.6.tar.bz2 --directory /
curl -sSf --retry 5 -o "$PY26TARFILE" "$PY26URL"
sudo tar xjf "$PY26TARFILE" --directory /
myuid=$(id -u)
mygid=$(id -g)
sudo chown -R $myuid:$mygid /home/travis/virtualenv
source /home/travis/virtualenv/python2.6/bin/activate
sudo chown -H -R $myuid:$mygid "$PY26VENVPATH"
source "$PY26VENVPATH/bin/activate"
set -x
python --version
pip --version
.travis/preinstall
sudo pip install 'tox<3' 'virtualenv==15.*' 'pluggy==0.5.*'
sudo pip list
env:
PY26URL: https://storage.googleapis.com/travis-ci-language-archives/python/binaries/ubuntu/14.04/x86_64/python-2.6.tar.bz2
VIRTUAL_ENV_DISABLE_PROMPT: "true"
sudo apt-get update
sudo apt-get install git
pip install 'tox<3' 'virtualenv==15.*' 'pluggy==0.5.*' \
"$TOX_LSR"
lsr_ci_preinstall
pip list
- name: Run tox tests
run: |
set -euo pipefail
source /home/travis/virtualenv/python2.6/bin/activate
source "$PY26VENVPATH/bin/activate"
set -x
tox -e py26,coveralls,custom
env:
LSR_ANSIBLES: 'ansible==2.7.* ansible==2.8.* ansible==2.9.*'
LSR_MSCENARIOS: default
VIRTUAL_ENV_DISABLE_PROMPT: "true"
tox -e py26,coveralls26,custom
55 changes: 0 additions & 55 deletions .travis/config.sh

This file was deleted.

13 changes: 0 additions & 13 deletions .travis/custom.sh

This file was deleted.

171 changes: 0 additions & 171 deletions .travis/custom_pylint.py

This file was deleted.

35 changes: 0 additions & 35 deletions .travis/preinstall

This file was deleted.

Loading

0 comments on commit 0d6ae71

Please sign in to comment.