Skip to content

Commit 0d6ae71

Browse files
committed
use new tox-lsr plugin
Remove the shared scripts and instead use the new tox-lsr plugin.
1 parent 6186a14 commit 0d6ae71

17 files changed

+39
-1214
lines changed

.ansible-lint

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
---
22
skip_list:
3-
- '602'
43
- '106'
54
- '208'
5+
- '301' # Commands should not change things if nothing needs doing
6+
- '305' # Use shell only when shell functionality is required
7+
- '306'
8+
- '403'
9+
- '502'
10+
- '602'

.github/workflows/tox.yml

+29-26
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
name: tox
33
on: # yamllint disable-line rule:truthy
44
- pull_request
5+
env:
6+
TOX_LSR: "git+https://github.com/linux-system-roles/[email protected]"
7+
LSR_ANSIBLES: 'ansible==2.7.* ansible==2.8.* ansible==2.9.*'
8+
LSR_MSCENARIOS: default
9+
# LSR_EXTRA_PACKAGES: libdbus-1-dev
10+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
511
jobs:
612
python:
713
runs-on: ubuntu-latest
@@ -15,15 +21,14 @@ jobs:
1521
uses: actions/setup-python@v2
1622
with:
1723
python-version: ${{ matrix.pyver }}
18-
- name: Install platform dependencies
19-
run: |
20-
set -euxo pipefail
21-
.travis/preinstall
22-
- name: Install pip, tox, python dependencies
24+
- name: Install platform dependencies, python, tox, tox-lsr
2325
run: |
2426
set -euxo pipefail
2527
python -m pip install --upgrade pip
26-
pip install tox
28+
sudo apt-get update
29+
sudo apt-get install git
30+
pip install "$TOX_LSR"
31+
lsr_ci_preinstall
2732
- name: Run tox tests
2833
run: |
2934
set -euxo pipefail
@@ -35,40 +40,38 @@ jobs:
3540
37) toxenvs="${toxenvs},coveralls,custom" ;;
3641
38) toxenvs="${toxenvs},coveralls,custom" ;;
3742
esac
38-
TOXENV="$toxenvs" .travis/runtox
39-
env:
40-
LSR_ANSIBLES: 'ansible==2.7.* ansible==2.8.* ansible==2.9.*'
41-
LSR_MSCENARIOS: default
43+
TOXENV="$toxenvs" lsr_ci_runtox
4244
python-26:
4345
runs-on: ubuntu-16.04
46+
env:
47+
PY26URL: https://storage.googleapis.com/travis-ci-language-archives/python/binaries/ubuntu/14.04/x86_64/python-2.6.tar.bz2
48+
PY26TARFILE: "python-2.6.tar.bz2"
49+
PY26VENVPATH: "/home/travis/virtualenv/python2.6"
50+
VIRTUAL_ENV_DISABLE_PROMPT: "true"
4451
steps:
4552
- name: checkout PR
4653
uses: actions/checkout@v2
4754
- name: Install python, dependencies
4855
run: |
4956
set -euo pipefail
50-
curl -sSf --retry 5 -o python-2.6.tar.bz2 ${PY26URL}
51-
sudo tar xjf python-2.6.tar.bz2 --directory /
57+
curl -sSf --retry 5 -o "$PY26TARFILE" "$PY26URL"
58+
sudo tar xjf "$PY26TARFILE" --directory /
5259
myuid=$(id -u)
5360
mygid=$(id -g)
54-
sudo chown -R $myuid:$mygid /home/travis/virtualenv
55-
source /home/travis/virtualenv/python2.6/bin/activate
61+
sudo chown -H -R $myuid:$mygid "$PY26VENVPATH"
62+
source "$PY26VENVPATH/bin/activate"
5663
set -x
5764
python --version
5865
pip --version
59-
.travis/preinstall
60-
sudo pip install 'tox<3' 'virtualenv==15.*' 'pluggy==0.5.*'
61-
sudo pip list
62-
env:
63-
PY26URL: https://storage.googleapis.com/travis-ci-language-archives/python/binaries/ubuntu/14.04/x86_64/python-2.6.tar.bz2
64-
VIRTUAL_ENV_DISABLE_PROMPT: "true"
66+
sudo apt-get update
67+
sudo apt-get install git
68+
pip install 'tox<3' 'virtualenv==15.*' 'pluggy==0.5.*' \
69+
"$TOX_LSR"
70+
lsr_ci_preinstall
71+
pip list
6572
- name: Run tox tests
6673
run: |
6774
set -euo pipefail
68-
source /home/travis/virtualenv/python2.6/bin/activate
75+
source "$PY26VENVPATH/bin/activate"
6976
set -x
70-
tox -e py26,coveralls,custom
71-
env:
72-
LSR_ANSIBLES: 'ansible==2.7.* ansible==2.8.* ansible==2.9.*'
73-
LSR_MSCENARIOS: default
74-
VIRTUAL_ENV_DISABLE_PROMPT: "true"
77+
tox -e py26,coveralls26,custom

.travis/config.sh

-55
This file was deleted.

.travis/custom.sh

-13
This file was deleted.

.travis/custom_pylint.py

-171
This file was deleted.

.travis/preinstall

-35
This file was deleted.

0 commit comments

Comments
 (0)