Commit b9fe00ab authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'qa-remove-k3d-installation' into 'master'

Remove k3d installation from QA Dockerfile

See merge request gitlab-org/gitlab!36971
parents 35379493 0b908b28
...@@ -7,7 +7,6 @@ ENV CHROME_VERSION="83.0.4103.61-1" ...@@ -7,7 +7,6 @@ ENV CHROME_VERSION="83.0.4103.61-1"
ENV CHROME_DRIVER_VERSION="83.0.4103.39" ENV CHROME_DRIVER_VERSION="83.0.4103.39"
ENV CHROME_DEB="google-chrome-stable_${CHROME_VERSION}_amd64.deb" ENV CHROME_DEB="google-chrome-stable_${CHROME_VERSION}_amd64.deb"
ENV CHROME_URL="https://s3.amazonaws.com/gitlab-google-chrome-stable/${CHROME_DEB}" ENV CHROME_URL="https://s3.amazonaws.com/gitlab-google-chrome-stable/${CHROME_DEB}"
ENV K3D_VERSION="1.3.4"
## ##
# Add support for stretch-backports # Add support for stretch-backports
...@@ -48,12 +47,6 @@ RUN wget -q "https://chromedriver.storage.googleapis.com/${CHROME_DRIVER_VERSION ...@@ -48,12 +47,6 @@ RUN wget -q "https://chromedriver.storage.googleapis.com/${CHROME_DRIVER_VERSION
RUN unzip chromedriver_linux64.zip -d /usr/local/bin RUN unzip chromedriver_linux64.zip -d /usr/local/bin
RUN rm -f chromedriver_linux64.zip RUN rm -f chromedriver_linux64.zip
##
# Install K3d local cluster support
# https://github.com/rancher/k3d
#
RUN curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG="v${K3D_VERSION}" bash
## ##
# Install gcloud and kubectl CLI used in Auto DevOps test to create K8s # Install gcloud and kubectl CLI used in Auto DevOps test to create K8s
# clusters # clusters
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment