openstack/kolla
Code Issues Proposed changes

Fix py36 gate job

Browse Source 
python 3.6 pycache also includes links - so those also
need to be removed

Depends-On: https://review.openstack.org/636750
Change-Id: I0f995df45bf203acc79cc7bd52b9ac51577468da
This commit is contained in:
Michal Nasiadka
2019-02-12 11:31:56 +01:00
parent 5922c22d8a
commit a490eef0d5
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/templates/template_overrides.j2
View File

@@ -41,6 +41,7 @@ RUN sed -i -e "/^mirrorlist/d" \
-e "/^metalink/d" \ -e "/^metalink/d" \
-e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://{{ nodepool_mirror_host }}|g" \ -e "s|^#baseurl=http://download.fedoraproject.org/pub|baseurl=http://{{ nodepool_mirror_host }}|g" \
-e "s|^baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \ -e "s|^baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \
-e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|g" \
-e "s|^baseurl=https://packages.elastic.co|baseurl={{ nodepool_elastic_proxy }}|g" \ -e "s|^baseurl=https://packages.elastic.co|baseurl={{ nodepool_elastic_proxy }}|g" \
-e "s|^baseurl=https://packagecloud.io/grafana|baseurl={{ nodepool_grafana_proxy }}|g" \ -e "s|^baseurl=https://packagecloud.io/grafana|baseurl={{ nodepool_grafana_proxy }}|g" \
-e "s|^baseurl=https://trunk.rdoproject.org|baseurl=http://{{ nodepool_rdo_proxy }}|g" \ -e "s|^baseurl=https://trunk.rdoproject.org|baseurl=http://{{ nodepool_rdo_proxy }}|g" \

32
tox.ini
View File

@@ -15,7 +15,7 @@ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE OS_TEST_TIMEOUT
PYTHON OS_TEST_PATH LISTOPT IDOPTION PYTHON OS_TEST_PATH LISTOPT IDOPTION
commands = commands =
find . -type f -name "*.py[c|o]" -delete find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
find . -type d -name "__pycache__" -delete find . -type d -name "__pycache__" -delete
python setup.py test --slowest --testr-args='{posargs}' python setup.py test --slowest --testr-args='{posargs}'
@@ -80,7 +80,7 @@ whitelist_externals = find
setenv = setenv =
DOCKER_BUILD_TEST=1 DOCKER_BUILD_TEST=1
commands = commands =
find . -type f -name "*.py[c|o]" -delete find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" bash -c "if [ ! -d .testrepository ]; then testr init; fi"
testr run test_build.BuildTestCentosBinary testr run test_build.BuildTestCentosBinary
{toxinidir}/tools/dump_info.sh {toxinidir}/tools/dump_info.sh
@@ -91,7 +91,7 @@ whitelist_externals = find
setenv = setenv =
DOCKER_BUILD_TEST=1 DOCKER_BUILD_TEST=1
commands = commands =
find . -type f -name "*.py[c|o]" -delete find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" bash -c "if [ ! -d .testrepository ]; then testr init; fi"
testr run test_build.BuildTestCentosSource testr run test_build.BuildTestCentosSource
{toxinidir}/tools/dump_info.sh {toxinidir}/tools/dump_info.sh
@@ -102,7 +102,7 @@ whitelist_externals = find
setenv = setenv =
DOCKER_BUILD_TEST=1 DOCKER_BUILD_TEST=1
commands = commands =
find . -type f -name "*.py[c|o]" -delete find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" bash -c "if [ ! -d .testrepository ]; then testr init; fi"
testr run test_build.BuildTestUbuntuBinary testr run test_build.BuildTestUbuntuBinary
{toxinidir}/tools/dump_info.sh {toxinidir}/tools/dump_info.sh
@@ -113,7 +113,7 @@ whitelist_externals = find
setenv = setenv =
DOCKER_BUILD_TEST=1 DOCKER_BUILD_TEST=1
commands = commands =
find . -type f -name "*.py[c|o]" -delete find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" bash -c "if [ ! -d .testrepository ]; then testr init; fi"
testr run test_build.BuildTestUbuntuSource testr run test_build.BuildTestUbuntuSource
{toxinidir}/tools/dump_info.sh {toxinidir}/tools/dump_info.sh
@@ -124,7 +124,7 @@ whitelist_externals = find
setenv = setenv =
DOCKER_BUILD_TEST=1 DOCKER_BUILD_TEST=1
commands = commands =
find . -type f -name "*.py[c|o]" -delete find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" bash -c "if [ ! -d .testrepository ]; then testr init; fi"
testr run test_build.BuildTestDebianBinary testr run test_build.BuildTestDebianBinary
{toxinidir}/tools/dump_info.sh {toxinidir}/tools/dump_info.sh
@@ -135,7 +135,7 @@ whitelist_externals = find
setenv = setenv =
DOCKER_BUILD_TEST=1 DOCKER_BUILD_TEST=1
commands = commands =
find . -type f -name "*.py[c|o]" -delete find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" bash -c "if [ ! -d .testrepository ]; then testr init; fi"
testr run test_build.BuildTestDebianSource testr run test_build.BuildTestDebianSource
{toxinidir}/tools/dump_info.sh {toxinidir}/tools/dump_info.sh
@@ -146,7 +146,7 @@ whitelist_externals = find
setenv = setenv =
DOCKER_BUILD_TEST=1 DOCKER_BUILD_TEST=1
commands = commands =
find . -type f -name "*.py[c|o]" -delete find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" bash -c "if [ ! -d .testrepository ]; then testr init; fi"
testr run test_build.BuildTestOracleLinuxBinary testr run test_build.BuildTestOracleLinuxBinary
{toxinidir}/tools/dump_info.sh {toxinidir}/tools/dump_info.sh
@@ -157,7 +157,7 @@ whitelist_externals = find
setenv = setenv =
DOCKER_BUILD_TEST=1 DOCKER_BUILD_TEST=1
commands = commands =
find . -type f -name "*.py[c|o]" -delete find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" bash -c "if [ ! -d .testrepository ]; then testr init; fi"
testr run test_build.BuildTestOracleLinuxSource testr run test_build.BuildTestOracleLinuxSource
{toxinidir}/tools/dump_info.sh {toxinidir}/tools/dump_info.sh
@@ -168,7 +168,7 @@ whitelist_externals = find
setenv = setenv =
DOCKER_BUILD_TEST=1 DOCKER_BUILD_TEST=1
commands = commands =
find . -type f -name "*.py[c|o]" -delete find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" bash -c "if [ ! -d .testrepository ]; then testr init; fi"
testr run test_build.DeployTestCentosBinary testr run test_build.DeployTestCentosBinary
{toxinidir}/tools/deploy_aio.sh centos binary {toxinidir}/tools/deploy_aio.sh centos binary
@@ -180,7 +180,7 @@ whitelist_externals = find
setenv = setenv =
DOCKER_BUILD_TEST=1 DOCKER_BUILD_TEST=1
commands = commands =
find . -type f -name "*.py[c|o]" -delete find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" bash -c "if [ ! -d .testrepository ]; then testr init; fi"
testr run test_build.DeployTestCentosSource testr run test_build.DeployTestCentosSource
{toxinidir}/tools/deploy_aio.sh centos source {toxinidir}/tools/deploy_aio.sh centos source
@@ -192,7 +192,7 @@ whitelist_externals = find
setenv = setenv =
DOCKER_BUILD_TEST=1 DOCKER_BUILD_TEST=1
commands = commands =
find . -type f -name "*.py[c|o]" -delete find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" bash -c "if [ ! -d .testrepository ]; then testr init; fi"
testr run test_build.DeployTestOracleLinuxBinary testr run test_build.DeployTestOracleLinuxBinary
{toxinidir}/tools/deploy_aio.sh oraclelinux binary {toxinidir}/tools/deploy_aio.sh oraclelinux binary
@@ -204,7 +204,7 @@ whitelist_externals = find
setenv = setenv =
DOCKER_BUILD_TEST=1 DOCKER_BUILD_TEST=1
commands = commands =
find . -type f -name "*.py[c|o]" -delete find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" bash -c "if [ ! -d .testrepository ]; then testr init; fi"
testr run test_build.DeployTestOracleLinuxSource testr run test_build.DeployTestOracleLinuxSource
{toxinidir}/tools/deploy_aio.sh oraclelinux source {toxinidir}/tools/deploy_aio.sh oraclelinux source
@@ -216,7 +216,7 @@ whitelist_externals = find
setenv = setenv =
DOCKER_BUILD_TEST=1 DOCKER_BUILD_TEST=1
commands = commands =
find . -type f -name "*.py[c|o]" -delete find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" bash -c "if [ ! -d .testrepository ]; then testr init; fi"
testr run test_build.DeployTestUbuntuBinary testr run test_build.DeployTestUbuntuBinary
{toxinidir}/tools/deploy_aio.sh ubuntu binary {toxinidir}/tools/deploy_aio.sh ubuntu binary
@@ -228,7 +228,7 @@ whitelist_externals = find
setenv = setenv =
DOCKER_BUILD_TEST=1 DOCKER_BUILD_TEST=1
commands = commands =
find . -type f -name "*.py[c|o]" -delete find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" bash -c "if [ ! -d .testrepository ]; then testr init; fi"
testr run test_build.DeployTestUbuntuSource testr run test_build.DeployTestUbuntuSource
{toxinidir}/tools/deploy_aio.sh ubuntu source {toxinidir}/tools/deploy_aio.sh ubuntu source
@@ -240,7 +240,7 @@ whitelist_externals = find
setenv = setenv =
DOCKER_BUILD_TEST=1 DOCKER_BUILD_TEST=1
commands = commands =
find . -type f -name "*.py[c|o]" -delete find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" bash -c "if [ ! -d .testrepository ]; then testr init; fi"
testr run test_build.BuildTestUbuntuSource testr run test_build.BuildTestUbuntuSource
{toxinidir}/tools/dump_info.sh {toxinidir}/tools/dump_info.sh