summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorDylan Griffith <dyl.griffith@gmail.com>2018-06-04 18:18:48 +0200
committerDylan Griffith <dyl.griffith@gmail.com>2018-06-05 18:39:06 +0200
commitbf9bc3782aafa0f4eca35d7d2c3faa2256e3987f (patch)
tree76be5e2de9241d2ce4cfad6230d08f0b563e43c3 /qa
parentc64e7bf04ea78e4bceaa134fba1ba64bd04a697f (diff)
downloadgitlab-ce-bf9bc3782aafa0f4eca35d7d2c3faa2256e3987f.tar.gz
Add gcloud and kubectl to Dockerfile for QA
Diffstat (limited to 'qa')
-rw-r--r--qa/Dockerfile9
1 files changed, 9 insertions, 0 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile
index 77cee9c5461..abf2184e1e2 100644
--- a/qa/Dockerfile
+++ b/qa/Dockerfile
@@ -28,6 +28,15 @@ RUN apt-get update -q && apt-get install -y google-chrome-stable && apt-get clea
RUN wget -q https://chromedriver.storage.googleapis.com/$(wget -q -O - https://chromedriver.storage.googleapis.com/LATEST_RELEASE)/chromedriver_linux64.zip
RUN unzip chromedriver_linux64.zip -d /usr/local/bin
+##
+# Install gcloud and kubectl CLI used in Auto DevOps test to create K8s
+# clusters
+#
+RUN export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \
+ echo "deb http://packages.cloud.google.com/apt $CLOUD_SDK_REPO main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
+ curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \
+ apt-get update -y && apt-get install google-cloud-sdk kubectl -y
+
WORKDIR /home/qa
COPY ./Gemfile* ./
RUN bundle install