diff options
| -rw-r--r-- | conductor/conductor/tests/functional/simulators/destroy_sdcsim.sh | 22 | ||||
| -rw-r--r-- | conductor/docker/Dockerfile | 4 |
2 files changed, 25 insertions, 1 deletions
diff --git a/conductor/conductor/tests/functional/simulators/destroy_sdcsim.sh b/conductor/conductor/tests/functional/simulators/destroy_sdcsim.sh new file mode 100644 index 0000000..d3411da --- /dev/null +++ b/conductor/conductor/tests/functional/simulators/destroy_sdcsim.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# +# ------------------------------------------------------------------------- +# Copyright (C) 2021 Wipro Limited. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------- +# +docker stop sdcsim +docker rm sdcsim +docker rmi sdcsim
\ No newline at end of file diff --git a/conductor/docker/Dockerfile b/conductor/docker/Dockerfile index 027f383..167aa11 100644 --- a/conductor/docker/Dockerfile +++ b/conductor/docker/Dockerfile @@ -15,7 +15,7 @@ # # ------------------------------------------------------------------------- -FROM nexus3.onap.org:10001/onap/integration-python:7.0.1 +FROM nexus3.onap.org:10001/onap/integration-python:8.0.0 ARG MVN_ARTIFACT_VERSION @@ -52,6 +52,8 @@ RUN apk --update add unzip && \ COPY onap-has-tm/optf-has-conductor-${MVN_ARTIFACT_VERSION}.zip /tmp/optf-has.zip RUN unzip -q -o -B /tmp/optf-has.zip -d /opt/has && rm -f /tmp/optf-has.zip +ENV CRYPTOGRAPHY_DONT_BUILD_RUST "1" + #PKG-INFO file must also exists in the conductor folder (i.e. besides and inside the of_has.egg-info folder). The zip file for distro above is missing it RUN cp /opt/has/conductor/of_has.egg-info/PKG-INFO /opt/has/conductor RUN pip install --no-cache-dir -e /opt/has/conductor |