projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug with SA08 when updating prometheus.yaml
[osm/devops.git]
/
docker
/
tests
/
Dockerfile
diff --git
a/docker/tests/Dockerfile
b/docker/tests/Dockerfile
index
a2c4378
..
0c1de38
100644
(file)
--- a/
docker/tests/Dockerfile
+++ b/
docker/tests/Dockerfile
@@
-15,24
+15,24
@@
########################################################################
########################################################################
-FROM ubuntu:
18.04 as INSTAL
L
+FROM ubuntu:
20.04 as FINA
L
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 \
- gcc=4:
7.4.0-1ubuntu2.3
\
- python3=3.
6.7-1~18.04
\
- python3-dev=3.
6.7-1~18.04
\
- python3-
setuptools=39.0.1-2
\
-
curl=7.58.0-2ubuntu3.13 &&
\
- python3 -m easy_install pip==21.0.1
+ gcc=4:
9.3.*
\
+ python3=3.
8.*
\
+ python3-dev=3.
8.*
\
+ python3-
pip=20.0.2*
\
+
python3-setuptools=45.2.*
\
+ curl=7.68.*
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
- gettext-base \
- git=1:2.
17.1-1ubuntu0.8
\
- iputils-ping=3:
20161105-1ubuntu3
\
- jq=1.
5+dfsg-2
\
- libcurl4-openssl-dev=7.
58.0-2ubuntu3.13
\
- libssl-dev=1.1.
1-1ubuntu2.1~18.04.9
+ gettext-base
=0.19.*
\
+ git=1:2.
25.*
\
+ iputils-ping=3:
*
\
+ jq=1.
6*
\
+ libcurl4-openssl-dev=7.
68.*
\
+ libssl-dev=1.1.
*
ARG OSM_TESTS_URL
ARG PYTHON3_OSM_IM_URL
ARG OSM_TESTS_URL
ARG PYTHON3_OSM_IM_URL
@@
-77,6
+77,9
@@
ENV ROBOT_REPORT_FOLDER=/robot-systest/results
# Kubeconfig file
ENV K8S_CREDENTIALS=/root/.kube/config
# Kubeconfig file
ENV K8S_CREDENTIALS=/root/.kube/config
+# OSM RSA file
+ENV OSM_RSA_FILE=/root/osm_id_rsa
+
ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8
ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8