From f158e4f526795123a959c77b9e75876cd18a04e2 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Tue, 20 Oct 2020 19:32:22 +0200 Subject: [PATCH] ci-e2e: Add Git (#28410) * ci-e2e: Add Git Signed-off-by: Arve Knudsen * Drone: Update e2e image Signed-off-by: Arve Knudsen --- .drone.yml | 12 ++++++------ scripts/build/ci-e2e/Dockerfile | 2 +- scripts/lib.star | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index ed751a40515..032c1650c7d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -128,7 +128,7 @@ steps: - package - name: end-to-end-tests - image: grafana/ci-e2e:12.18-1 + image: grafana/ci-e2e:12.19.0-1 commands: - ./node_modules/.bin/cypress install - ./bin/grabpl e2e-tests @@ -423,7 +423,7 @@ steps: - package - name: end-to-end-tests - image: grafana/ci-e2e:12.18-1 + image: grafana/ci-e2e:12.19.0-1 commands: - ./node_modules/.bin/cypress install - ./bin/grabpl e2e-tests @@ -859,7 +859,7 @@ steps: - package - name: end-to-end-tests - image: grafana/ci-e2e:12.18-1 + image: grafana/ci-e2e:12.19.0-1 commands: - ./node_modules/.bin/cypress install - ./bin/grabpl e2e-tests @@ -1221,7 +1221,7 @@ steps: - package - name: end-to-end-tests - image: grafana/ci-e2e:12.18-1 + image: grafana/ci-e2e:12.19.0-1 commands: - ./node_modules/.bin/cypress install - ./bin/grabpl e2e-tests @@ -1628,7 +1628,7 @@ steps: - package - name: end-to-end-tests - image: grafana/ci-e2e:12.18-1 + image: grafana/ci-e2e:12.19.0-1 commands: - ./node_modules/.bin/cypress install - ./bin/grabpl e2e-tests @@ -1980,7 +1980,7 @@ steps: - package - name: end-to-end-tests - image: grafana/ci-e2e:12.18-1 + image: grafana/ci-e2e:12.19.0-1 commands: - ./node_modules/.bin/cypress install - ./bin/grabpl e2e-tests diff --git a/scripts/build/ci-e2e/Dockerfile b/scripts/build/ci-e2e/Dockerfile index 6423ee79dea..f7e411bcac8 100644 --- a/scripts/build/ci-e2e/Dockerfile +++ b/scripts/build/ci-e2e/Dockerfile @@ -2,7 +2,7 @@ FROM node:12.19.0-buster-slim WORKDIR /root -RUN apt-get update && apt-get install -yq gnupg netcat curl +RUN apt-get update && apt-get install -yq gnupg netcat curl git RUN curl -fsSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - && \ echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list && \ # Cypress dependencies diff --git a/scripts/lib.star b/scripts/lib.star index a9fe3651d4f..a43af3115ab 100644 --- a/scripts/lib.star +++ b/scripts/lib.star @@ -605,7 +605,7 @@ def e2e_tests_server_step(): def e2e_tests_step(): return { 'name': 'end-to-end-tests', - 'image': 'grafana/ci-e2e:12.18-1', + 'image': 'grafana/ci-e2e:12.19.0-1', 'depends_on': [ 'end-to-end-tests-server', ],