From 033afe1574b80eceba1857368f33441a9cddb1d8 Mon Sep 17 00:00:00 2001
From: Maxime Guyot <Miouge1@users.noreply.github.com>
Date: Wed, 1 Apr 2020 16:19:28 +0200
Subject: [PATCH] Fix Docker in Docker CI jobs (#5867)
---
.gitlab-ci.yml | 3 ---
.gitlab-ci/packet.yml | 6 ++++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce33a84f4..d437d3d6e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,6 @@ stages:
variables:
FAILFASTCI_NAMESPACE: 'kargo-ci'
GITLAB_REPOSITORY: 'kargo-ci/kubernetes-sigs-kubespray'
- # DOCKER_HOST: tcp://localhost:2375
ANSIBLE_FORCE_COLOR: "true"
MAGIC: "ci check this"
TEST_ID: "$CI_PIPELINE_ID-$CI_BUILD_ID"
@@ -45,8 +44,6 @@ before_script:
.testcases: &testcases
<<: *job
- services:
- - docker:dind
before_script:
- update-alternatives --install /usr/bin/python python /usr/bin/python3 1
- ./tests/scripts/rebase.sh
diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
index 0202733d9..c07b1add5 100644
--- a/.gitlab-ci/packet.yml
+++ b/.gitlab-ci/packet.yml
@@ -102,9 +102,11 @@ packet_centos7-calico-ha:
when: manual
packet_centos7-calico-ha-once-localhost:
- stage: deploy-part2
+ stage: unit-tests
extends: .packet
- when: manual
+ when: on_success
+ services:
+ - docker:18.09.9-dind
packet_centos7-kube-ovn:
stage: deploy-part2
--
GitLab