projects
/
osm
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes tests QUOTAS-01, BASIC-08 and hackfest_cloudinit for SOL006
[osm/tests.git]
/
docker
/
Dockerfile
diff --git
a/docker/Dockerfile
b/docker/Dockerfile
index
b13f2ea
..
72bf215
100644
(file)
--- a/
docker/Dockerfile
+++ b/
docker/Dockerfile
@@
-25,16
+25,19
@@
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install git soft
RUN add-apt-repository -y ppa:rmescandon/yq && apt update && apt install yq -y
RUN python3 -m pip install haikunator requests robotframework robotframework-seleniumlibrary robotframework-requests robotframework-jsonlibrary \
RUN add-apt-repository -y ppa:rmescandon/yq && apt update && apt install yq -y
RUN python3 -m pip install haikunator requests robotframework robotframework-seleniumlibrary robotframework-requests robotframework-jsonlibrary \
- robotframework-sshlibrary charm-tools git+https://osm.etsi.org/gerrit/osm/IM.git
git+https://osm.etsi.org/gerrit/osm/osmclient.git
+ robotframework-sshlibrary charm-tools git+https://osm.etsi.org/gerrit/osm/IM.git
@sol006 git+https://osm.etsi.org/gerrit/osm/osmclient.git@sol006
# 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