X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2Ftests%2FDockerfile;h=3b5aae093ee4df30f85ff604afb9edc95629d5d7;hb=32c0195ea32b27c7e4df2f0c97601f6e3b9bcb63;hp=49a1e4c4d6b391be936a1841bc6063fc2c0cc598;hpb=069e46f28033b9ecc99d7975887ecbd9b1e13ee9;p=osm%2Fdevops.git diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile index 49a1e4c4..3b5aae09 100644 --- a/docker/tests/Dockerfile +++ b/docker/tests/Dockerfile @@ -37,8 +37,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ 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.* @@ -61,13 +64,22 @@ RUN pip3 install \ -r /usr/lib/python3/dist-packages/osmclient/requirements.txt \ -r /usr/share/osm-tests/requirements.txt +# 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 \ + google-cloud-cli=455.* \ + kubectl=1.28.* + +# 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 -COPY pyangbind.patch /robot-systest -RUN patch /usr/local/lib/python3.10/dist-packages/pyangbind/lib/yangtypes.py < /robot-systest/pyangbind.patch - ARG CACHE_DATE=not_a_date RUN git clone \ https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages.git \