diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2022-07-01 09:49:58 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2022-09-23 13:17:47 +0200 |
| commit | 7e195ded9fa55e4c535b751fb9289f191b81c48c (patch) | |
| tree | 6a95600053566cf48d56395aa680e2f5da415cf9 /docker/core | |
| parent | 5695081fd63d50b8e6286f80c7cd4921ed3a9ee9 (diff) | |
Update to Alpine 3.16
It also switches to pytest because
nose fails vs py3.10.
Change-Id: I920baef12d4934b359873519d5518835007c2f02
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 861f79d46397d8bbc5b55b95bc4ca2ac0fb1f247)
Diffstat (limited to 'docker/core')
| -rw-r--r-- | docker/core/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/core/testcases.yaml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 649c1060..a610ceef 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.15 +FROM alpine:3.16 ARG BRANCH=stable/yoga ARG OPENSTACK_TAG=stable/yoga @@ -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 |