From e6288ba6b497061e280caa5a574fe22a9ba9f504 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 11 Aug 2021 15:52:47 +0200 Subject: Update to Alpine 3.14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id0b5ecc341315b0010a4e52dcb54ebe7bb37c5f7 Signed-off-by: Cédric Ollivier --- docker/core/Dockerfile | 4 ++-- docker/core/testcases.yaml | 6 +++--- docker/mts/Dockerfile | 2 +- docker/mts/testcases.yaml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'docker') diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index c746fd06..c91c636e 100644 --- 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 04d48ab1..508d1031 100644 --- 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 b4bba75e..eae61aab 100644 --- 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 0b9ee668..69d05210 100644 --- 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 -- cgit 1.2.3-korg