[INT] Include testsuite repo in smoke-usecases-robot-py3 image

- we also have this in the non-py3 image
- fix broken docker build for healthcheck image
- fix broken docker build for security image

Issue-ID: INT-2294
Change-Id: I712ca75f80b9b2fe8c46b41dc0c44133da0a42c2
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/healthcheck/docker/Dockerfile b/healthcheck/docker/Dockerfile
index 5e0a5e1..1ef051f 100644 (file)
--- a/healthcheck/docker/Dockerfile
+++ b/healthcheck/docker/Dockerfile
@@ -1,37 +1,31 @@
-FROM opnfv/xtesting:jerma
+FROM opnfv/xtesting:leguer
 
 ARG OPENSTACK_TAG=stable/newton
-ARG PIP_TAG=20.1
 ARG OPNFV_TAG=stable/jerma
 ARG ONAP_TAG=master
+ARG PIP_TAG=20.1
 
-ENV PYTHONPATH $PYTHONPATH:/src/testing-utils/robotframework-onap/eteutils
-ENV TAG all
+ENV PYTHONPATH=$PYTHONPATH:/src/testing-utils/robotframework-onap/eteutils
+ENV TAG=all
 ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
 
 COPY requirements.txt requirements.txt
 COPY upper-constraints.txt upper-constraints.txt
+RUN git clone --depth 1 https://git.onap.org/testsuite -b $ONAP_TAG /var/opt/ONAP
+RUN git clone --depth 1 https://git.onap.org/demo -b $ONAP_TAG /src/demo
 RUN apk --no-cache add --update openssl chromium chromium-chromedriver && \
     apk --no-cache add --virtual .build-deps --update \
         python3-dev build-base linux-headers libffi-dev \
-        openssl-dev libjpeg-turbo-dev curl && \
-    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
-    . "$HOME/.cargo/env" && \
-    pip3 install --upgrade pip && \
-    pip3 install --no-cache-dir \
+        openssl-dev libjpeg-turbo-dev curl rust
+RUN pip3 install -U pip wheel
+RUN pip3 install --no-cache-dir \
         -cupper-constraints.txt \
         git+https://git.onap.org/testsuite/heatbridge.git@$ONAP_TAG#egg=heatbridge\&subdirectory=heatbridge  \
-        git+https://git.onap.org/testsuite/python-testing-utils.git@$ONAP_TAG#egg=robotframework-onap\&subdirectory=robotframework-onap && \
-    git clone --depth 1 https://git.onap.org/testsuite -b $ONAP_TAG /var/opt/ONAP && \
-    git clone --depth 1 https://git.onap.org/demo -b $ONAP_TAG /src/demo && \
-    pip install \
-        -cupper-constraints.txt \
-        -rrequirements.txt && \
-    mkdir -p /var/opt/ONAP/demo/heat && cp -Rf /src/demo/heat/vFW /var/opt/ONAP/demo/heat/ && \
+        git+https://git.onap.org/testsuite/python-testing-utils.git@$ONAP_TAG#egg=robotframework-onap\&subdirectory=robotframework-onap \
+        -rrequirements.txt
+RUN mkdir -p /var/opt/ONAP/demo/heat && cp -Rf /src/demo/heat/vFW /var/opt/ONAP/demo/heat/ && \
     mkdir -p /demo/service_mapping && cp -Rf /src/demo/service_mapping /demo/ && \
     mkdir -p /var/opt/ONAP/demo/preload_data && cp -Rf /src/demo/preload_data /var/opt/ONAP/demo/ && \
-    ln -s /usr/lib/python3.7/site-packages/vcpeutils /usr/lib/python3.7/site-packages/SoUtils && \
-    ln -s /usr/lib/python3.7/site-packages/heatbridge /usr/lib/python3.7/site-packages/HeatBridge && \
     rm -r requirements.txt /var/opt/ONAP/.git /src/demo && \
     cd / && ln -s /var/opt/ONAP/robot/ /robot && \
     apk del .build-deps

diff --git a/security/docker/Dockerfile b/security/docker/Dockerfile
index 0146698..7d63904 100644 (file)
--- a/security/docker/Dockerfile
+++ b/security/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21 AS build_yq
+FROM golang:1.24 AS build_yq
 WORKDIR /go/src/github.com/mikefarah/
 RUN git clone https://github.com/mikefarah/yq.git --depth 1
 WORKDIR /go/src/github.com/mikefarah/yq

diff --git a/smoke-usecases-robot-py3/docker/Dockerfile b/smoke-usecases-robot-py3/docker/Dockerfile
index f25df54..df8b8d1 100644 (file)
--- a/smoke-usecases-robot-py3/docker/Dockerfile
+++ b/smoke-usecases-robot-py3/docker/Dockerfile
@@ -21,14 +21,15 @@ RUN apk --no-cache add --update openssl && \
         python3-dev build-base linux-headers libffi-dev \
         openssl-dev libjpeg-turbo-dev
 RUN git clone --depth 1 https://github.com/onap/cps.git -b $ONAP_TAG /cps  && \
-    find /cps -mindepth 1 -name csit -prune -o -exec rm -rf {} + 
+    find /cps -mindepth 1 -name csit -prune -o -exec rm -rf {} +
 RUN git clone --depth 1 https://github.com/onap/cps-cps-temporal.git -b $ONAP_TAG /cps-cps-temporal  && \
-    find /cps-cps-temporal -mindepth 1 -name csit -prune -o -exec rm -rf {} + 
+    find /cps-cps-temporal -mindepth 1 -name csit -prune -o -exec rm -rf {} +
 RUN git clone --depth 1 https://github.com/onap/cps-ncmp-dmi-plugin.git -b $ONAP_TAG /cps-ncmp-dmi-plugin  && \
-    find /cps-ncmp-dmi-plugin -mindepth 1 -name csit -prune -o -exec rm -rf {} + 
+    find /cps-ncmp-dmi-plugin -mindepth 1 -name csit -prune -o -exec rm -rf {} +
+RUN git clone --depth 1 https://git.onap.org/testsuite -b $ONAP_TAG /var/opt/ONAP
 RUN pip install --upgrade pip
 RUN pip install \
-        -rrequirements.txt && \
+        -r requirements.txt && \
     rm -r requirements.txt && \
     cd / && ln -s /var/opt/ONAP/robot/ /robot && \
     apk del .build-deps
@@ -36,4 +37,3 @@ RUN pip install \
 COPY docker/testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml
 COPY scripts/cmd.sh /
 CMD ["/cmd.sh"]
-