aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
Diffstat (limited to 'security')
-rw-r--r--security/docker/Dockerfile3
-rw-r--r--security/requirements.txt10
2 files changed, 7 insertions, 6 deletions
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