diff options
| -rw-r--r-- | benchmarking/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | candidate-usecases/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | infra-healthcheck/docker/Dockerfile | 5 | ||||
| -rw-r--r-- | security/docker/Dockerfile | 3 | ||||
| -rw-r--r-- | security/requirements.txt | 10 | ||||
| -rw-r--r-- | smoke-usecases-pythonsdk/docker/Dockerfile | 2 |
6 files changed, 13 insertions, 11 deletions
diff --git a/benchmarking/docker/Dockerfile b/benchmarking/docker/Dockerfile index 8e856f2..2e5f653 100644 --- a/benchmarking/docker/Dockerfile +++ b/benchmarking/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/xtesting +FROM opnfv/xtesting:wallaby ARG OPENSTACK_TAG=master ARG OPNFV_TAG=master ARG ONAP_TAG=master diff --git a/candidate-usecases/docker/Dockerfile b/candidate-usecases/docker/Dockerfile index b6dae67..a8af59e 100644 --- a/candidate-usecases/docker/Dockerfile +++ b/candidate-usecases/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/xtesting +FROM opnfv/xtesting:wallaby MAINTAINER Morgan Richomme <morgan.richomme@orange.com> 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 \ diff --git a/security/docker/Dockerfile b/security/docker/Dockerfile index b6b35d2..ded4d3e 100644 --- a/security/docker/Dockerfile +++ b/security/docker/Dockerfile @@ -16,7 +16,7 @@ RUN git clone https://git.onap.org/integration --depth 1 WORKDIR /opt/onap/integration/test/security/sslendpoints RUN CGO_ENABLED=0 go install -a -ldflags '-w -s -extldflags "-static"' -FROM opnfv/xtesting AS run +FROM opnfv/xtesting:wallaby AS run ARG KUBERNETES_VERSION="v1.19.9" ARG ONAP_TAG=master @@ -58,6 +58,7 @@ RUN set -x && \ chmod +x /usr/local/bin/kube-bench && \ chmod +x /usr/local/bin/sslendpoints && \ chmod +x /check_*.sh && \ + rm -rf /usr/lib/python3.8/site-packages/PyYAML* && \ pip3 install --upgrade pip && \ pip3 install --no-cache-dir \ git+https://git.onap.org/integration/xtesting.git@$ONAP_TESTS_TAG#subdirectory=security && \ diff --git a/security/requirements.txt b/security/requirements.txt index 6e8b944..58ac315 100644 --- a/security/requirements.txt +++ b/security/requirements.txt @@ -2,12 +2,12 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. coverage!=4.4 # Apache-2.0 -mock # BSD +# mock # BSD nose # LGPL -flake8>=2.5.4 # MIT -pylint>=2.1 # GPLv2 -yamllint -bashate # Apache-2.0 +# flake8>=2.5.4 # MIT +# pylint>=2.1 # GPLv2 +# yamllint +# bashate # Apache-2.0 xtesting Kubernetes colorama diff --git a/smoke-usecases-pythonsdk/docker/Dockerfile b/smoke-usecases-pythonsdk/docker/Dockerfile index 99d4628..696862a 100644 --- a/smoke-usecases-pythonsdk/docker/Dockerfile +++ b/smoke-usecases-pythonsdk/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/xtesting +FROM opnfv/xtesting:wallaby MAINTAINER Morgan Richomme <morgan.richomme@orange.com> |