diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2024-09-09 10:30:15 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2024-09-09 10:31:17 +0200 |
| commit | c4de3877ca0ff53820fb8019f1cea067969f16ad (patch) | |
| tree | 888ad6f904b932a61ceef51ec9a2b03ae9913451 | |
| parent | 66f8394c745bd7a3951699134e0ee8d4369f6d6b (diff) | |
Update to Alpine 3.20
Please note functest kubernetes now hosts its
upper-constraints.txt.
Change-Id: I87a4fa5e5437841d7f708d3ed9cc332d3b676cfb
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | docker/core/Dockerfile | 13 | ||||
| -rw-r--r-- | upper-constraints.txt | 24 |
2 files changed, 30 insertions, 7 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index b6507da1..8ebd2c51 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,8 +1,7 @@ -FROM alpine:3.16 +FROM alpine:3.20 ARG BRANCH=master ARG OPENSTACK_TAG=master -ARG OPNFV_TAG=master COPY Try-a-quick-fix-vs-asynchronuous-issues.patch /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch @@ -25,16 +24,16 @@ RUN apk -U upgrade && \ (cd /src/functest-kubernetes && \ git fetch --tags https://gerrit.opnfv.org/gerrit/functest-kubernetes $BRANCH && \ git checkout FETCH_HEAD) && \ - pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src \ - -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \ + pip3 install --break-system-packages --use-deprecated=legacy-resolver --no-cache-dir --src /src \ + -c/src/functest-kubernetes/upper-constraints.txt \ -c/src/requirements/upper-constraints.txt \ setuptools_scm && \ - pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src \ - -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \ + pip3 install --break-system-packages --use-deprecated=legacy-resolver --no-cache-dir --src /src \ + -c/src/functest-kubernetes/upper-constraints.txt \ -c/src/requirements/upper-constraints.txt \ /src/functest-kubernetes && \ (cd /src/rally && patch -p1 < /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch) && \ - (cd /usr/lib/python3.10/site-packages/xrally_kubernetes/ && \ + (cd /usr/lib/python3.12/site-packages/xrally_kubernetes/ && \ patch -p2 < /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch) && \ rm -rf /src/functest-kubernetes /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch && \ bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \ diff --git a/upper-constraints.txt b/upper-constraints.txt new file mode 100644 index 00000000..c0aafa98 --- /dev/null +++ b/upper-constraints.txt @@ -0,0 +1,24 @@ +git+https://gerrit.opnfv.org/gerrit/functest#egg=functest +git+https://github.com/collivier/cloudify-rest-client.git@4.3.3-py3#egg=cloudify-rest-client +robotframework===4.1.2 +robotframework-httplibrary===0.4.2 +robotframework-requests===0.9.2 +robotframework-sshlibrary===3.8.0 +xtesting===1.0.0 +bandit===1.7.5 +bandit===1.7.0 +ruamel.yaml.jinja2==0.2.2 +-e git+https://opendev.org/openstack/tempest#egg=tempest +-e git+https://opendev.org/openstack/rally.git#egg=rally +git+https://opendev.org/openstack/rally-openstack.git#egg=rally-openstack +git+https://github.com/xrally/xrally-kubernetes.git#egg=xrally-kubernetes +pylint===2.11.1 +flake8===4.0.1 +pytest===7.1.2 +pytest-cov===3.0.0 +pytest-html===3.1.1 +ruamel.yaml===0.17.17 +sphinxcontrib-spelling===4.3.0 +ansible-lint===5.2.1 +setuptools_scm===6.3.2 +pre-commit===3.1.1 |