From 861f79d46397d8bbc5b55b95bc4ca2ac0fb1f247 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 1 Jul 2022 09:49:58 +0200 Subject: Update to Alpine 3.16 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It also switches to pytest because nose fails vs py3.10. Change-Id: I920baef12d4934b359873519d5518835007c2f02 Signed-off-by: Cédric Ollivier --- docker/core/Dockerfile | 4 ++-- docker/core/testcases.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'docker/core') diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index b083e36a..f8d21c22 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.15 +FROM alpine:3.16 ARG BRANCH=master ARG OPENSTACK_TAG=master @@ -27,7 +27,7 @@ RUN apk -U upgrade && \ addgroup -g 1000 xtesting && adduser -u 1000 -G xtesting -D xtesting && \ mkdir -p /var/lib/xtesting/results && chown -R xtesting: /var/lib/xtesting && \ apk del .build-deps -COPY testcases.yaml /usr/lib/python3.9/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /usr/lib/python3.10/site-packages/xtesting/ci/testcases.yaml USER xtesting WORKDIR /var/lib/xtesting/results CMD ["run_tests", "-t", "all"] diff --git a/docker/core/testcases.yaml b/docker/core/testcases.yaml index 508d1031..360869d4 100644 --- a/docker/core/testcases.yaml +++ b/docker/core/testcases.yaml @@ -50,7 +50,7 @@ tiers: args: suites: - >- - /usr/lib/python3.9/site-packages/xtesting/samples/HelloWorld.robot + /usr/lib/python3.10/site-packages/xtesting/samples/HelloWorld.robot variable: - 'var01:foo' - 'var02:bar' @@ -64,7 +64,7 @@ tiers: name: behaveframework args: suites: - - /usr/lib/python3.9/site-packages/xtesting/samples/features + - /usr/lib/python3.10/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.9/site-packages/xtesting/samples + private_data_dir: /usr/lib/python3.10/site-packages/xtesting/samples playbook: helloworld.yml -- cgit 1.2.3-korg