diff options
| author |   morganrol <morgan.richomme@orange.com> | 2021-08-18 16:42:58 +0200 |
|---|---|---|
| committer | Morgan Richomme <morgan.richomme@orange.com> | 2021-08-19 11:53:38 +0000 |
| commit | 2e7b7aa9773c4aa8e0334a1398bb12171e6b53d8 (patch) | |
| tree | 1fbe6ce519fbb0d3493133e01df14114db55d9bf /infra-healthcheck | |
| parent | 4a9c09556e7d8b9b59353eeb1a930ef1fb818433 (diff) | |
[XTESTING] Fix opnfv/xtesting version to wallaby
opnfv/xtesting master triggered a change in the alpine baseline image (3.14)
As a consequence the xtesting docker relying on master were broken, as the
list of testcases was not overwrittent in pytho3.9 lib folder
2 options were possible:
- fix the version (wallaby)
- align the xtesting dockers and change the path to use 3.9
option1 is more secured.
For the moment python3.8 is enough for the SDK.
If needed we could upgrade later.
Issue-ID: TEST-359
Signed-off-by: morganrol <morgan.richomme@orange.com>
Change-Id: Iaeada26416e0929a11c17f5c2803448c5a23888c
Diffstat (limited to 'infra-healthcheck')
| -rw-r--r-- | infra-healthcheck/docker/Dockerfile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/infra-healthcheck/docker/Dockerfile b/infra-healthcheck/docker/Dockerfile index b67ed30..20819ed 100644 --- a/infra-healthcheck/docker/Dockerfile +++ b/infra-healthcheck/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/xtesting +FROM opnfv/xtesting:wallaby ARG KUBERNETES_VERSION="v1.19.9" ARG HELM_VERSION="v2.16.6" @@ -22,11 +22,12 @@ RUN set -x && \ gcc python3-dev musl-dev openssl-dev libffi-dev && \ chmod +x /usr/local/bin/kubectl && \ adduser kubectl -Du 2342 -h /config && \ - wget https://storage.googleapis.com/kubernetes-helm/helm-${HELM_VERSION}-linux-amd64.tar.gz -O - | tar -xzO linux-amd64/helm > /usr/local/bin/helm && \ + wget https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz -O - | tar -xzO linux-amd64/helm > /usr/local/bin/helm && \ wget https://get.helm.sh/helm-${HELM3_VERSION}-linux-amd64.tar.gz -O - | tar -xzO linux-amd64/helm > /usr/local/bin/helm3 && \ wget -O /check_for_ingress_and_nodeports.py https://git.onap.org/integration/plain/test/security/check_for_ingress_and_nodeports.py?h=$ONAP_TAG &&\ chmod +x /usr/local/bin/helm && \ chmod +x /usr/local/bin/helm3 && \ + rm -rf /usr/lib/python3.8/site-packages/PyYAML* && \ pip3 install --upgrade pip && \ pip3 install --no-cache-dir -r upper-constraints.txt && \ pip3 install --no-cache-dir \ |