Update to Alpine 3.14

Change-Id: Id0b5ecc341315b0010a4e52dcb54ebe7bb37c5f7
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/.travis.yml b/.travis.yml
index 66ba80e..3c798de 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ jobs:
   include:
     - stage: run unit tests
       script: >
-        tox -e docs,pep8,pylint,yamllint,ansiblelint,bashate,py38,cover
+        tox -e docs,pep8,pylint,yamllint,ansiblelint,bashate,py39,cover
     - stage: build xtesting images
       script: sudo -E bash build.sh
       env:

diff --git a/ansible/site.gate.yml b/ansible/site.gate.yml
index 89ebc7a..f293632 100644 (file)
--- a/ansible/site.gate.yml
+++ b/ansible/site.gate.yml
@@ -8,7 +8,7 @@
       docker_tags:
         - latest:
             branch: master
-            dependency: '3.13'
+            dependency: '3.14'
       builds:
         dependency:
           repo: _

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index c746fd0..c91c636 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.13
+FROM alpine:3.14
 
 ARG BRANCH=master
 ARG OPENSTACK_TAG=master
@@ -25,5 +25,5 @@ RUN apk -U upgrade && \
         /src/functest-xtesting && \
     rm -r /src/functest-xtesting upper-constraints.txt && \
     apk del .build-deps
-COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml
+COPY testcases.yaml /usr/lib/python3.9/site-packages/xtesting/ci/testcases.yaml
 CMD ["run_tests", "-t", "all"]

diff --git a/docker/core/testcases.yaml b/docker/core/testcases.yaml
index 04d48ab..508d103 100644 (file)
--- a/docker/core/testcases.yaml
+++ b/docker/core/testcases.yaml
@@ -50,7 +50,7 @@ tiers:
           args:
             suites:
               - >-
-                /usr/lib/python3.8/site-packages/xtesting/samples/HelloWorld.robot
+                /usr/lib/python3.9/site-packages/xtesting/samples/HelloWorld.robot
             variable:
               - 'var01:foo'
               - 'var02:bar'
@@ -64,7 +64,7 @@ tiers:
           name: behaveframework
           args:
             suites:
-              - /usr/lib/python3.8/site-packages/xtesting/samples/features
+              - /usr/lib/python3.9/site-packages/xtesting/samples/features
             tags:
               - foo
       - case_name: eighth
@@ -76,5 +76,5 @@ tiers:
         run:
           name: ansible
           args:
-            private_data_dir: /usr/lib/python3.8/site-packages/xtesting/samples
+            private_data_dir: /usr/lib/python3.9/site-packages/xtesting/samples
             playbook: helloworld.yml

diff --git a/docker/mts/Dockerfile b/docker/mts/Dockerfile
index b4bba75..eae61aa 100644 (file)
--- a/docker/mts/Dockerfile
+++ b/docker/mts/Dockerfile
@@ -21,5 +21,5 @@ RUN case $(uname -m) in x86_64) \
             java -jar target/mts-${MTS_TAG}-installer.jar -options /src/mts-installer.properties) && \
         rm -rf /root/.m2/ ${APP_FOLDER}/tutorial /src/mts-installer.properties /src/git-mts && \
         apk del .build-deps;; esac
-COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml
+COPY testcases.yaml /usr/lib/python3.9/site-packages/xtesting/ci/testcases.yaml
 CMD ["run_tests", "-t", "all"]

diff --git a/docker/mts/testcases.yaml b/docker/mts/testcases.yaml
index 0b9ee66..69d0521 100644 (file)
--- a/docker/mts/testcases.yaml
+++ b/docker/mts/testcases.yaml
@@ -15,7 +15,7 @@ tiers:
                 run:
                     name: 'mts'
                     args:
-                        test_file: /usr/lib/python3.8/site-packages/xtesting/samples/mts/test.xml
+                        test_file: /usr/lib/python3.9/site-packages/xtesting/samples/mts/test.xml
                         testcases:
                             - Pause_5_sec
                         max_duration: 2 # in seconds

diff --git a/tox.ini b/tox.ini
index 9b48dc3..a7304e4 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = docs,pep8,pylint,yamllint,ansiblelint,bashate,py38,cover,perm
+envlist = docs,pep8,pylint,yamllint,ansiblelint,bashate,py39,cover,perm
 skipsdist = True
 
 [testenv]
@@ -20,24 +20,24 @@ commands = nosetests --with-xunit \
   xtesting/tests/unit
 
 [testenv:docs]
-basepython = python3.8
+basepython = python3.9
 commands =
   doc8 README.rst api --ignore-path api/build
   sphinx-build -W -b html api/ api/build
 
 [testenv:pep8]
-basepython = python3.8
+basepython = python3.9
 commands = flake8
 
 [testenv:pylint]
-basepython = python3.8
+basepython = python3.9
 whitelist_externals = bash
 commands =
   pylint --min-similarity-lines=10 \
     --disable=locally-disabled --ignore-imports=y --reports=n --extension-pkg-whitelist=lxml xtesting
 
 [testenv:yamllint]
-basepython = python3.8
+basepython = python3.9
 files =
   .travis.yml
   ansible
@@ -46,7 +46,7 @@ commands =
   yamllint -s {[testenv:yamllint]files}
 
 [testenv:ansiblelint]
-basepython = python3.8
+basepython = python3.9
 commands =
   ansible-lint -x303,305,306 ansible/site.yml
 
@@ -54,17 +54,17 @@ commands =
 commands = nosetests xtesting/tests/unit
 
 [testenv:bashate]
-basepython = python3.8
+basepython = python3.9
 files =
   build.sh
 commands = bashate {[testenv:bashate]files}
 
 [testenv:bandit]
-basepython = python3.8
+basepython = python3.9
 commands = bandit -r xtesting -x tests -n 5 -ll -s B602
 
 [testenv:cover]
-basepython = python3.8
+basepython = python3.9
 dirs =
   xtesting/tests/unit/ci
   xtesting/tests/unit/core
@@ -76,7 +76,7 @@ commands = nosetests --with-coverage --cover-tests \
   --cover-min-percentage 100 {[testenv:cover]dirs}
 
 [testenv:perm]
-basepython = python3.8
+basepython = python3.9
 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 ee04cbc..7478b7e 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -3,7 +3,7 @@ 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.4.4;python_version=='3.8'
+pylint===2.4.4;python_version=='3.9'
 flake8===3.9.2
 nose===1.3.7
 ansible-lint===4.3.7