diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2024-09-06 10:58:24 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2024-09-06 12:02:20 +0200 |
| commit | e8c1a3da8d98f09a1b455d6eebe17c1345e7bfbc (patch) | |
| tree | 3dbc5377c1d31336851525a14bce1e8d8c6ecde1 /docker | |
| parent | a1ba6fb90620f04ef49f5d29d5ce0e2d812e37b2 (diff) | |
Update to Alpine 3.20
Please note that it also updates python to 3.12.
Change-Id: I715194304b37b9cd52affa998a94ba5ec52e7732
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/core/Dockerfile | 8 | ||||
| -rw-r--r-- | docker/core/testcases.yaml | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index a21eef1a..409cd2d8 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.17 +FROM alpine:3.20 ARG BRANCH=master ARG OPENSTACK_TAG=master @@ -10,7 +10,7 @@ RUN apk -U upgrade && \ wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ sed -i -E /^packaging==+.*$/d upper-constraints.txt && \ case $(uname -m) in aarch*|arm*) CFLAGS="-O0" \ - pip3 install --no-cache-dir \ + pip3 install --break-system-packages --no-cache-dir \ -cupper-constraints.txt \ -chttps://git.opnfv.org/functest-xtesting/plain/upper-constraints.txt?h=$BRANCH \ lxml ;; esac && \ @@ -18,7 +18,7 @@ RUN apk -U upgrade && \ (cd /src/functest-xtesting && \ git fetch --tags https://gerrit.opnfv.org/gerrit/functest-xtesting $BRANCH && \ git checkout FETCH_HEAD) && \ - pip3 install --no-cache-dir --src /src \ + pip3 install --break-system-packages --no-cache-dir --src /src \ -cupper-constraints.txt \ -chttps://git.opnfv.org/functest-xtesting/plain/upper-constraints.txt?h=$BRANCH \ /src/functest-xtesting && \ @@ -26,7 +26,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.10/site-packages/xtesting/ci/testcases.yaml +COPY testcases.yaml /usr/lib/python3.12/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 deee73b6..3c3bd0b6 100644 --- a/docker/core/testcases.yaml +++ b/docker/core/testcases.yaml @@ -50,7 +50,7 @@ tiers: args: suites: - >- - /usr/lib/python3.10/site-packages/xtesting/samples/HelloWorld.robot + /usr/lib/python3.12/site-packages/xtesting/samples/HelloWorld.robot variable: - 'var01:foo' - 'var02:bar' @@ -64,7 +64,7 @@ tiers: name: behaveframework args: suites: - - /usr/lib/python3.10/site-packages/xtesting/samples/features + - /usr/lib/python3.12/site-packages/xtesting/samples/features tags: - foo - case_name: eighth @@ -76,7 +76,7 @@ tiers: run: name: ansible args: - private_data_dir: /usr/lib/python3.10/site-packages/xtesting/samples + private_data_dir: /usr/lib/python3.12/site-packages/xtesting/samples playbook: helloworld.yml - case_name: nineth project_name: xtesting @@ -88,4 +88,4 @@ tiers: run: name: pytest args: - dir: /usr/lib/python3.10/site-packages/xtesting/samples/fourth.py + dir: /usr/lib/python3.12/site-packages/xtesting/samples/fourth.py |