diff options
Diffstat (limited to 'cmso-robot')
| -rw-r--r-- | cmso-robot/docker/Dockerfile | 51 | ||||
| -rw-r--r-- | cmso-robot/pom.xml | 22 |
2 files changed, 33 insertions, 40 deletions
diff --git a/cmso-robot/docker/Dockerfile b/cmso-robot/docker/Dockerfile index 7f8eb81..70f0578 100644 --- a/cmso-robot/docker/Dockerfile +++ b/cmso-robot/docker/Dockerfile @@ -5,18 +5,22 @@ MAINTAINER "CMSO" LABEL name="Docker image for the CMSO Robot Testing Framework" LABEL usage="docker run -e <testname> optf-cmso-robot" -RUN apt-get update -RUN apt-get install -y software-properties-common vim -RUN add-apt-repository ppa:jonathonf/python-3.6 -RUN apt-get update -RUN apt-get install -y build-essential python3.6 python3.6-dev python3-pip python3.6-venv - -# update pip -RUN python3.6 -m pip install pip --upgrade -RUN python3.6 -m pip install wheel - -RUN apt-get update \ - && apt-get install \ +ARG http_proxy_arg +ARG https_proxy_arg +ENV HTTP_PROXY=$http_proxy_arg +ENV HTTPS_PROXY=$https_proxy_arg +ENV http_proxy=$HTTP_PROXY +ENV https_proxy=$HTTPS_PROXY + +RUN test -n "$" && echo "Acquire::Proxy \"http://$http_proxy\";" > /etc/apt/apt.conf.d/02proxy || true && \ + apt-get update && \ + apt-get install -y software-properties-common vim && \ + add-apt-repository ppa:jonathonf/python-3.6 && \ + apt-get update && \ + apt-get install -y build-essential python3.6 python3.6-dev python3-pip python3.6-venv && \ + python3.6 -m pip install pip --upgrade && \ + python3.6 -m pip install wheel && \ + apt-get install \ --no-install-recommends \ --assume-yes \ chromium-browser \ @@ -30,21 +34,16 @@ COPY /onap-cmso/robot /opt/cmso-robot/robot COPY /onap-cmso/mocking /opt/cmso-robot/mocking COPY /onap-cmso/ete.sh /opt/cmso-robot -RUN chmod 777 /opt/cmso-robot/ete.sh -COPY /onap-cmso/server.py /opt/cmso-robot - - -RUN ln -s /usr/bin/python3.6 /usr/bin/python -RUN python --version -RUN pip --version -RUN pip install robotframework==3.1.1 - -RUN pip install Flask -RUN pip install requests -RUN pip install selenium -RUN pip install robotframework-sshlibrary -RUN pip install robotframework-requests +RUN ln -s /usr/bin/python3.6 /usr/bin/python && \ + python --version && \ + pip --version && \ + pip install robotframework==3.1.1 && \ + pip install Flask && \ + pip install requests && \ + pip install selenium && \ + pip install robotframework-sshlibrary && \ + pip install robotframework-requests ### Start up the mock server for CMD ["/usr/bin/python", "/opt/cmso-robot/mocking/mock.py"] diff --git a/cmso-robot/pom.xml b/cmso-robot/pom.xml index 0a7696b..8137e74 100644 --- a/cmso-robot/pom.xml +++ b/cmso-robot/pom.xml @@ -34,23 +34,12 @@ <description>Robot Framework for testing CMSO Service</description>
<properties>
- <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-
- <cmso.project.version>${project.version}</cmso.project.version>
- <cmso.build.timestamp>${maven.build.timestamp}</cmso.build.timestamp>
-
- <release-tag>Dublin</release-tag>
<service.name>cmso-robot</service.name>
- <name.space>org.onap.optf</name.space>
<serviceArtifactName>cmso-robot</serviceArtifactName>
<build.number>${maven.build.timestamp}</build.number>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-
- <docker.push.registry>localhost:5000</docker.push.registry>
- <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
<docker.skip.build>false</docker.skip.build>
<docker.skip.push>false</docker.skip.push>
<docker.skip.tag>false</docker.skip.tag>
@@ -96,7 +85,7 @@ <apiVersion>1.23</apiVersion>
<images>
<image>
- <name>onap/optf-cmso-robot</name>
+ <name>${image.namespace}/optf-cmso-robot</name>
<alias>onap-optf-cmso-robot</alias>
<build>
<cleanup>true</cleanup>
@@ -110,7 +99,12 @@ <descriptor>${project.basedir}/docker/assembly/cmso-files.xml</descriptor>
<name>onap-cmso</name>
</assembly>
-
+ <args>
+ <!-- plugin cannot handle empty (no proxy) arguments
+ <http_proxy_arg>${docker.http_proxy}</http_proxy_arg>
+ <https_proxy_arg>${docker.https_proxy}</https_proxy_arg>
+ -->
+ </args>
</build>
</image>
</images>
@@ -131,7 +125,7 @@ <goal>push</goal>
</goals>
<configuration>
- <image>onap/optf-cmso-robot:%l</image>
+ <image>${image.namespace}/optf-cmso-robot:%l</image>
</configuration>
</execution>
</executions>
|