X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2Ftests%2FDockerfile;h=d981f8471e798a145e692a07c806c3b33769dba7;hb=22efe2bec456db3036c7bb83ba27f602367135de;hp=e4f7ae4ee01786262d8e74e75d0278c0075555bb;hpb=02feb8ef9ae5f545a111759cbbe9f01b1741cc85;p=osm%2Fdevops.git diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile index e4f7ae4e..d981f847 100644 --- a/docker/tests/Dockerfile +++ b/docker/tests/Dockerfile @@ -33,16 +33,18 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ && rm -rf /var/lib/apt/lists/* ####################################################################################### -# End of common prepration +# End of common preparation RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - gettext-base=0.19.* \ - git=1:2.25.* \ + apt-transport-https \ + ca-certificates \ + gettext-base=0.21* \ + git=1:2.34.* \ + gnupg \ iputils-ping=3:* \ jq=1.6* \ - libcurl4-openssl-dev=7.68.* \ - libssl-dev=1.1.* + libmagic1=1:5.* ARG OSM_TESTS_URL ARG PYTHON3_OSM_IM_URL @@ -62,7 +64,16 @@ RUN pip3 install \ -r /usr/lib/python3/dist-packages/osmclient/requirements.txt \ -r /usr/share/osm-tests/requirements.txt +# Google Cloud CLI +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 apt-get update && apt-get install -y google-cloud-sdk + +# Azure CLI +RUN curl -sL https://aka.ms/InstallAzureCLIDeb | bash + 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