projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add check on installation of helm-charts in install_ngsa.sh
[osm/devops.git]
/
docker
/
tests
/
Dockerfile
diff --git
a/docker/tests/Dockerfile
b/docker/tests/Dockerfile
index
e4f7ae4
..
49a1e4c
100644
(file)
--- a/
docker/tests/Dockerfile
+++ b/
docker/tests/Dockerfile
@@
-33,16
+33,15
@@
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
&& rm -rf /var/lib/apt/lists/*
#######################################################################################
&& rm -rf /var/lib/apt/lists/*
#######################################################################################
-# End of common prepration
+# End of common prep
a
ration
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install \
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install \
- gettext-base=0.
19.
* \
- git=1:2.
25
.* \
+ gettext-base=0.
21
* \
+ git=1:2.
34
.* \
iputils-ping=3:* \
jq=1.6* \
iputils-ping=3:* \
jq=1.6* \
- libcurl4-openssl-dev=7.68.* \
- libssl-dev=1.1.*
+ libmagic1=1:5.*
ARG OSM_TESTS_URL
ARG PYTHON3_OSM_IM_URL
ARG OSM_TESTS_URL
ARG PYTHON3_OSM_IM_URL
@@
-66,6
+65,9
@@
RUN mv /usr/share/osm-tests/robot-systest /robot-systest
RUN mv /usr/share/osm-tests/conformance-tests/ /robot-systest/
RUN mv /usr/share/osm-tests/charm.sh /usr/sbin/charm
RUN mv /usr/share/osm-tests/conformance-tests/ /robot-systest/
RUN mv /usr/share/osm-tests/charm.sh /usr/sbin/charm
+COPY pyangbind.patch /robot-systest
+RUN patch /usr/local/lib/python3.10/dist-packages/pyangbind/lib/yangtypes.py < /robot-systest/pyangbind.patch
+
ARG CACHE_DATE=not_a_date
RUN git clone \
https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages.git \
ARG CACHE_DATE=not_a_date
RUN git clone \
https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages.git \