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-07-07 10:43:38 +0200 |
| commit | 861f79d46397d8bbc5b55b95bc4ca2ac0fb1f247 (patch) | |
| tree | e396c5e2e67e6045dedea9f54163a8fa8880d277 /docker | |
| parent | 4c91aa8d974d95fec6b39741102327716a7cf20d (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>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/core/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/core/testcases.yaml | 6 | ||||
| -rw-r--r-- | docker/mts/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/mts/testcases.yaml | 2 |
4 files changed, 7 insertions, 7 deletions
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 diff --git a/docker/mts/Dockerfile b/docker/mts/Dockerfile index ae32d8b8..502cf754 100644 --- a/docker/mts/Dockerfile +++ b/docker/mts/Dockerfile @@ -22,6 +22,6 @@ 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.9/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /usr/lib/python3.10/site-packages/xtesting/ci/testcases.yaml USER xtesting CMD ["run_tests", "-t", "all"] diff --git a/docker/mts/testcases.yaml b/docker/mts/testcases.yaml index 69d05210..4ebeeabb 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.9/site-packages/xtesting/samples/mts/test.xml + test_file: /usr/lib/python3.10/site-packages/xtesting/samples/mts/test.xml testcases: - Pause_5_sec max_duration: 2 # in seconds |