diff options
| -rw-r--r-- | .circleci/config.yml | 2 | ||||
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | ansible/site.yml | 2 | ||||
| -rw-r--r-- | build.sh | 4 | ||||
| -rw-r--r-- | docker/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/testcases.yaml | 4 | ||||
| -rw-r--r-- | tox.ini | 20 | ||||
| -rw-r--r-- | upper-constraints.txt | 4 |
8 files changed, 22 insertions, 20 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 566e3cec..f258e04a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 jobs: build: docker: - - image: circleci/python:3.7.4 + - image: circleci/python:3.8 steps: - checkout - run: diff --git a/.travis.yml b/.travis.yml index 2c7cfcff..be0eb844 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ before_script: - sudo apt-get -y install qemu-user-static - sudo add-apt-repository -y ppa:deadsnakes/ppa - sudo apt-get update - - sudo apt-get install python3.7 python3.7-dev + - sudo apt-get install python3.8 python3.8-dev - sudo pip install tox - sudo -E docker login -u="${DOCKER_USERNAME}" -p="${DOCKER_PASSWORD}" - (cd .. && git clone https://github.com/estesp/manifest-tool) diff --git a/ansible/site.yml b/ansible/site.yml index 8fa19688..b042d57b 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -7,7 +7,7 @@ - repo: _ dport: container: alpine - tag: '3.10' + tag: '3.11' steps: - name: opnfv/xtesting containers: @@ -19,10 +19,10 @@ build_opts=(--pull=true --no-cache --force-rm=true) for arch in ${arch};do if [[ ${arch} == arm64 ]]; then find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.10|multiarch/alpine:arm64-v3.10|g" {} + + -e "s|alpine:3.11|multiarch/alpine:arm64-v3.11|g" {} + elif [[ ${arch} == arm ]]; then find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.10|multiarch/alpine:armhf-v3.10|g" {} + + -e "s|alpine:3.11|multiarch/alpine:armhf-v3.11|g" {} + fi (cd docker && docker build "${build_opts[@]}" \ -t "${repo}/${image}:${arch}-${tag}" .) diff --git a/docker/Dockerfile b/docker/Dockerfile index 8c1e00dd..7b908cd4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.10 +FROM alpine:3.11 ARG BRANCH=master ARG OPENSTACK_TAG=master @@ -16,5 +16,5 @@ RUN apk --no-cache add --update python3 bash git mailcap && \ /src/functest-xtesting && \ rm -r /src/functest-xtesting && \ apk del .build-deps -COPY testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/testcases.yaml b/docker/testcases.yaml index 259848fd..7708a86c 100644 --- a/docker/testcases.yaml +++ b/docker/testcases.yaml @@ -60,7 +60,7 @@ tiers: name: 'robotframework' args: suites: - - /usr/lib/python3.7/site-packages/xtesting/samples/HelloWorld.robot + - /usr/lib/python3.8/site-packages/xtesting/samples/HelloWorld.robot variable: - 'var01:foo' - 'var02:bar' @@ -76,6 +76,6 @@ tiers: name: 'behaveframework' args: suites: - - /usr/lib/python3.7/site-packages/xtesting/samples/features/ + - /usr/lib/python3.8/site-packages/xtesting/samples/features/ tags: - foo @@ -1,5 +1,5 @@ [tox] -envlist = docs,pep8,pylint,yamllint,ansiblelint,bashate,py27,py37,cover,perm +envlist = docs,pep8,pylint,yamllint,ansiblelint,bashate,py27,py38,cover,perm skipsdist = True [testenv] @@ -19,24 +19,24 @@ commands = nosetests --with-xunit \ xtesting/tests/unit [testenv:docs] -basepython = python3.7 +basepython = python3.8 commands = doc8 README.rst api --ignore-path api/build sphinx-build -W -b html api/ api/build [testenv:pep8] -basepython = python3.7 +basepython = python3.8 commands = flake8 [testenv:pylint] -basepython = python3.7 +basepython = python3.8 whitelist_externals = bash commands = pylint --min-similarity-lines=10 \ --disable=locally-disabled --ignore-imports=y --reports=n xtesting [testenv:yamllint] -basepython = python3.7 +basepython = python3.8 files = .travis.yml ansible @@ -45,7 +45,7 @@ commands = yamllint -s {[testenv:yamllint]files} [testenv:ansiblelint] -basepython = python3.7 +basepython = python3.8 commands = ansible-lint -x303 ansible/site.yml @@ -53,17 +53,17 @@ commands = commands = nosetests xtesting/tests/unit [testenv:bashate] -basepython = python3.7 +basepython = python3.8 files = build.sh commands = bashate {[testenv:bashate]files} [testenv:bandit] -basepython = python3.7 +basepython = python3.8 commands = bandit -r xtesting -x tests -n 5 -ll -s B602 [testenv:cover] -basepython = python3.7 +basepython = python3.8 dirs = xtesting/tests/unit/ci xtesting/tests/unit/core @@ -75,7 +75,7 @@ commands = nosetests --with-coverage --cover-tests \ --cover-min-percentage 100 {[testenv:cover]dirs} [testenv:perm] -basepython = python3.7 +basepython = python3.8 whitelist_externals = bash path=. -not -path './.tox/*' -not -path './.git/*' -not -path './doc/reveal.js/*' commands = diff --git a/upper-constraints.txt b/upper-constraints.txt index 1c35e41f..926e5b92 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -3,4 +3,6 @@ bandit===1.1.0 behave===1.2.6 behave-html-formatter===0.9.4;python_version>='3.5' pylint===1.9.5;python_version=='2.7' -pylint===2.3.1;python_version=='3.7' +pylint===2.4.4;python_version=='3.8' +flake8===3.7.9 +nose===1.3.7 |