diff options
Diffstat (limited to 'csit/resources')
| -rw-r--r-- | csit/resources/Dockerfile | 6 | ||||
| -rwxr-xr-x | csit/resources/scripts/build-csit-docker-image.sh | 19 |
2 files changed, 16 insertions, 9 deletions
diff --git a/csit/resources/Dockerfile b/csit/resources/Dockerfile index 77231d56..8f0190b2 100644 --- a/csit/resources/Dockerfile +++ b/csit/resources/Dockerfile @@ -3,9 +3,9 @@ ARG CSIT_SCRIPT=${CSIT_SCRIPT} ARG ROBOT_FILE=${ROBOT_FILE} ENV ROBOT_WORKSPACE=/opt/robotworkspace ROBOT_FILE=$ROBOT_FILE TEST_ENV=$TEST_ENV RUN apt-get update && apt-get install -y gcc; \ - python3 -m pip -qq install --upgrade pip && \ - python3 -m pip -qq install --upgrade --extra-index-url="https://nexus3.onap.org/repository/PyPi.staging/simple" 'robotframework-onap==0.6.0.*' --pre && \ - python3 -m pip -qq install --upgrade confluent-kafka && \ + python3 -m pip -qq install --upgrade pip; \ + python3 -m pip -qq install --upgrade confluent-kafka; \ + python3 -m pip -qq install --upgrade --extra-index-url="https://nexus3.onap.org/repository/PyPi.staging/simple" 'robotframework-onap==0.6.0.*' --pre; \ python3 -m pip freeze; \ mkdir -p ${ROBOT_WORKSPACE} COPY scripts/run-test.sh tests/ ${ROBOT_WORKSPACE}/ diff --git a/csit/resources/scripts/build-csit-docker-image.sh b/csit/resources/scripts/build-csit-docker-image.sh index 8b5aa7d6..ad5dd7e4 100755 --- a/csit/resources/scripts/build-csit-docker-image.sh +++ b/csit/resources/scripts/build-csit-docker-image.sh @@ -13,6 +13,8 @@ # 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. +# +# SPDX-License-Identifier: Apache-2.0 function clone_models() { # download models examples @@ -37,16 +39,21 @@ fi GERRIT_BRANCH=$(awk -F= '$1 == "defaultbranch" { print $2 }' "${WORKSPACE}"/.gitreview) export ROBOT_DOCKER_IMAGE="policy-csit-robot" -cd ${WORKSPACE}/csit/resources || exit +cd "${WORKSPACE}"/csit/resources || exit + +IMAGE_ID=$(docker images -q "onap/${ROBOT_DOCKER_IMAGE}") -docker image rm -f ${ROBOT_DOCKER_IMAGE} +if [ -n "$IMAGE_ID" ]; then + echo "Image onap/${ROBOT_DOCKER_IMAGE} exists. Removing..." + docker rmi "onap/${ROBOT_DOCKER_IMAGE}" +fi # get models clone_models -echo "Build robot framework docker image" +echo "Building robot framework docker image" docker build . --file Dockerfile --tag "onap/${ROBOT_DOCKER_IMAGE}" --quiet -docker save -o policy-csit-robot.tar ${ROBOT_DOCKER_IMAGE}:latest +docker save -o policy-csit-robot.tar "onap/${ROBOT_DOCKER_IMAGE}":latest -rm -rf ${WORKSPACE}/csit/resources/policy-csit-robot.tar -rm -rf ${WORKSPACE}/csit/resources/tests/models/ +rm -rf "${WORKSPACE}"/csit/resources/policy-csit-robot.tar +rm -rf "${WORKSPACE}"/csit/resources/tests/models/ |