removed impossible testing combos

This commit is contained in:
diginc 2017-11-05 21:30:07 -06:00
parent 8886784b2e
commit bcfcc85ef3
3 changed files with 10 additions and 6 deletions

View File

@ -11,7 +11,7 @@ env:
- OS=debian ARCH=aarch64 - OS=debian ARCH=aarch64
- OS=alpine ARCH=amd64 - OS=alpine ARCH=amd64
- OS=alpine ARCH=armhf - OS=alpine ARCH=armhf
- OS=alpine ARCH=aarch64 # - OS=alpine ARCH=aarch64 # Impossible combo :(
python: python:
- "2.7" - "2.7"
install: install:

View File

@ -64,10 +64,11 @@ images = {
'base': 'multiarch/alpine:armhf-edge', 'base': 'multiarch/alpine:armhf-edge',
'arch': 'armhf' 'arch': 'armhf'
}, },
{ # Impossible combo :(
'base': 'multiarch/alpine:aarch64-edge', # {
'arch': 'aarch64' # 'base': 'multiarch/alpine:aarch64-edge',
} # 'arch': 'aarch64'
# }
] ]
} }

View File

@ -63,6 +63,7 @@ def os(request):
return request.param return request.param
@pytest.fixture() @pytest.fixture()
@pytest.mark.skipif((os == 'alpine' and arch == 'aarch64'), 'musl does not have aarch64 yet')
def tag(request, os, arch): def tag(request, os, arch):
return '{}_{}'.format(os, arch) return '{}_{}'.format(os, arch)
@ -84,8 +85,9 @@ def image(request, tag):
def cmd(request): def cmd(request):
return 'tail -f /dev/null' return 'tail -f /dev/null'
@pytest.fixture(scope='module', params=['amd64', 'armhf', 'aarch64']) @pytest.fixture(scope='module', params=['amd64'])
def persist_arch(request): def persist_arch(request):
'''amd64 only dnsmasq will not start under qemu-user-static :('''
return request.param return request.param
@pytest.fixture(scope='module', params=['debian', 'alpine']) @pytest.fixture(scope='module', params=['debian', 'alpine'])
@ -96,6 +98,7 @@ def persist_os(request):
def persist_args(request): def persist_args(request):
return '-e ServerIP="127.0.0.1" -e ServerIPv6="::1"' return '-e ServerIP="127.0.0.1" -e ServerIPv6="::1"'
@pytest.mark.skipif((persist_os == 'alpine' and persist_arch == 'aarch64'), 'musl does not have aarch64 yet')
@pytest.fixture(scope='module') @pytest.fixture(scope='module')
def persist_tag(request, persist_os, persist_arch): def persist_tag(request, persist_os, persist_arch):
return '{}_{}'.format(persist_os, persist_arch) return '{}_{}'.format(persist_os, persist_arch)