X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2Ftests%2FDockerfile;h=3b5aae093ee4df30f85ff604afb9edc95629d5d7;hb=e400dfdf8dd2bdd67321fa70a56cef6458533dbc;hp=f4699adf5ce06711b6f0e29478d4d0b336eca331;hpb=55a9ad4590d0abff6f3c2328a711e5fa59410c18;p=osm%2Fdevops.git

diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile
index f4699adf..3b5aae09 100644
--- a/docker/tests/Dockerfile
+++ b/docker/tests/Dockerfile
@@ -1,4 +1,5 @@
-# Copyright 2020 ETSI
+#######################################################################################
+# Copyright ETSI Contributors and Others.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,24 +13,38 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+#######################################################################################
 
-########################################################################
+FROM ubuntu:22.04 as FINAL
 
-FROM ubuntu:18.04 as INSTALL
+ARG APT_PROXY
+RUN if [ ! -z $APT_PROXY ] ; then \
+    echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\
+    echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\
+    fi
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    gcc=4:7.4.0-1ubuntu2.3 \
-    python3=3.6.7-1~18.04 \
-    python3-dev=3.6.7-1~18.04 \
-    python3-setuptools=39.0.1-2 \
-    curl=7.58.0-2ubuntu3.13 && \
-    python3 -m easy_install pip==21.0.1
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    git=1:2.17.1-1ubuntu0.8 \
-    libcurl4-openssl-dev=7.58.0-2ubuntu3.13 \
-    libssl-dev=1.1.1-1ubuntu2.1~18.04.9
+    gcc=4:11.* \
+    python3=3.10.* \
+    python3-dev=3.10.* \
+    python3-pip=22.0.* \
+    curl=7.81.* \
+    && rm -rf /var/lib/apt/lists/*
+
+#######################################################################################
+# End of common preparation
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+    apt-transport-https \
+    ca-certificates \
+    gettext-base=0.21* \
+    git=1:2.34.* \
+    gnupg \
+    iputils-ping=3:* \
+    jq=1.6* \
+    libmagic1=1:5.*
 
 ARG OSM_TESTS_URL
 ARG PYTHON3_OSM_IM_URL
@@ -49,28 +64,27 @@ RUN pip3 install \
     -r /usr/lib/python3/dist-packages/osmclient/requirements.txt \
     -r /usr/share/osm-tests/requirements.txt
 
-RUN git clone \
-    https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages.git \
-    --recurse-submodules \
-    /robot-systest/osm-packages
-
-FROM ubuntu:18.04
-
+# Google Cloud CLI and kubectl
+RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
+RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
-    DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.7-1~18.04
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+    google-cloud-cli=455.* \
+    kubectl=1.28.*
 
-COPY --from=INSTALL /usr/bin/ssh-keygen /usr/bin/ssh-keygen
-COPY --from=INSTALL /usr/lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/
-COPY --from=INSTALL /lib/x86_64-linux-gnu/ /lib/x86_64-linux-gnu/
+# Azure CLI
+RUN curl -sL https://aka.ms/InstallAzureCLIDeb | bash
 
-COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
-COPY --from=INSTALL /usr/local/lib/python3.6/dist-packages  /usr/local/lib/python3.6/dist-packages
-COPY --from=INSTALL /usr/bin/osm /usr/bin/osm
+RUN mv /usr/share/osm-tests/robot-systest /robot-systest
+RUN mv /usr/share/osm-tests/cloud-scripts /robot-systest/
+RUN mv /usr/share/osm-tests/conformance-tests/ /robot-systest/
+RUN mv /usr/share/osm-tests/charm.sh /usr/sbin/charm
 
-COPY --from=INSTALL /usr/share/osm-tests/robot-systest /robot-systest
-COPY --from=INSTALL /usr/share/osm-tests/charm.sh /usr/sbin/charm
-COPY --from=INSTALL /robot-systest/osm-packages /robot-systest/osm-packages
-COPY --from=INSTALL /usr/local/bin/robot /usr/local/bin/
+ARG CACHE_DATE=not_a_date
+RUN git clone \
+    https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages.git \
+    --recurse-submodules \
+    /robot-systest/osm-packages
 
 WORKDIR /robot-systest
 
@@ -89,6 +103,9 @@ ENV ROBOT_REPORT_FOLDER=/robot-systest/results
 # Kubeconfig file
 ENV K8S_CREDENTIALS=/root/.kube/config
 
+# OSM RSA file
+ENV OSM_RSA_FILE=/root/osm_id_rsa
+
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8