From 026088deeaab63bf96c4f0a06f24215709661e34 Mon Sep 17 00:00:00 2001
From: Maxime Guyot <Miouge1@users.noreply.github.com>
Date: Sat, 20 Apr 2019 15:19:40 +0200
Subject: [PATCH] Re-Add docker:dind for Packet CI (#4567)
---
.gitlab-ci.yml | 4 ++++
.gitlab-ci/gce.yml | 5 -----
.gitlab-ci/packet.yml | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74fe6ec18..8250733e4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,6 +39,8 @@ before_script:
.testcases: &testcases
<<: *job
+ services:
+ - docker:dind
before_script:
- /usr/bin/python -m pip install -r tests/requirements.txt
- mkdir -p /.ssh
@@ -52,6 +54,8 @@ before_script:
- ls
- echo ${PWD}
- echo "${STARTUP_SCRIPT}"
+ # Docker is required on the ansible host for download_run_once and download_localhost
+ - docker info
- cd tests && make create-${CI_PLATFORM} -s ; cd -
# Check out latest tag if testing upgrade
diff --git a/.gitlab-ci/gce.yml b/.gitlab-ci/gce.yml
index 6db75c322..da9ab4fbf 100644
--- a/.gitlab-ci/gce.yml
+++ b/.gitlab-ci/gce.yml
@@ -6,10 +6,6 @@
CI_PLATFORM: "gce"
PRIVATE_KEY: $GCE_PRIVATE_KEY
-.docker_service: &docker_service
- services:
- - docker:dind
-
.cache: &cache
cache:
key: "$CI_BUILD_REF_NAME"
@@ -19,7 +15,6 @@
.gce: &gce
extends: .testcases
- <<: *docker_service
<<: *cache
variables:
<<: *gce_variables
diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
index 18530c4cb..70103ddbd 100644
--- a/.gitlab-ci/packet.yml
+++ b/.gitlab-ci/packet.yml
@@ -104,7 +104,7 @@ packet_rhel7-canal-sep:
packet_centos7-calico-ha:
stage: deploy-special
<<: *packet
- when: manual
+ when: on_success
except: ['triggers']
only: ['master', /^pr-.*$/]
--
GitLab