projects
/
osm
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated hackfest_multivdu: removed SSH access password, public key file will be used...
[osm/tests.git]
/
docker
/
Dockerfile
diff --git
a/docker/Dockerfile
b/docker/Dockerfile
index
2ae03c9
..
7e0bbce
100644
(file)
--- a/
docker/Dockerfile
+++ b/
docker/Dockerfile
@@
-29,12
+29,15
@@
RUN python3 -m pip install haikunator requests robotframework robotframework-sel
# Preparing working environment
WORKDIR /robot-systest
# Preparing working environment
WORKDIR /robot-systest
-RUN git clone https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages.git --recurse-submodules /robot-systest/osm-packages
+RUN git clone
--branch sol006
https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages.git --recurse-submodules /robot-systest/osm-packages
# Copy robot folder and charm.sh
COPY robot-systest /robot-systest
COPY charm.sh /usr/sbin/charm
# Copy robot folder and charm.sh
COPY robot-systest /robot-systest
COPY charm.sh /usr/sbin/charm
+# Copy conformance tests data
+COPY conformance-tests /robot-systest/conformance-tests
+
# Folder where Robot tests are stored
ENV ROBOT_DEVOPS_FOLDER=/robot-systest
# Folder where Robot tests are stored
ENV ROBOT_DEVOPS_FOLDER=/robot-systest
@@
-45,7
+48,7
@@
ENV ENVIRONMENTS_FOLDER=environments
ENV PACKAGES_FOLDER=/robot-systest/osm-packages
# Folder where test results should be exported
ENV PACKAGES_FOLDER=/robot-systest/osm-packages
# Folder where test results should be exported
-ENV ROBOT_REPORT_FOLDER=/robot-systest/re
sul
ts
+ENV ROBOT_REPORT_FOLDER=/robot-systest/re
por
ts
# Kubeconfig file
ENV K8S_CREDENTIALS=/root/.kube/config
# Kubeconfig file
ENV K8S_CREDENTIALS=/root/.kube/config