C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix Docker in Docker CI jobs (#5867)

Browse source
This commit is contained in:
Maxime Guyot 2020-04-01 16:19:28 +02:00 committed by GitHub
parent c35461a005
commit 033afe1574
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitlab-ci.yml
View file

@ -10,7 +10,6 @@ stages:
variables: variables:
FAILFASTCI_NAMESPACE: 'kargo-ci' FAILFASTCI_NAMESPACE: 'kargo-ci'
GITLAB_REPOSITORY: 'kargo-ci/kubernetes-sigs-kubespray' GITLAB_REPOSITORY: 'kargo-ci/kubernetes-sigs-kubespray'
# DOCKER_HOST: tcp://localhost:2375
ANSIBLE_FORCE_COLOR: "true" ANSIBLE_FORCE_COLOR: "true"
MAGIC: "ci check this" MAGIC: "ci check this"
TEST_ID: "$CI_PIPELINE_ID-$CI_BUILD_ID" TEST_ID: "$CI_PIPELINE_ID-$CI_BUILD_ID"
@ -45,8 +44,6 @@ before_script:
.testcases: &testcases .testcases: &testcases
<<: *job <<: *job
services:
- docker:dind
before_script: before_script:
- update-alternatives --install /usr/bin/python python /usr/bin/python3 1 - update-alternatives --install /usr/bin/python python /usr/bin/python3 1
- ./tests/scripts/rebase.sh - ./tests/scripts/rebase.sh

6
.gitlab-ci/packet.yml
View file

@ -102,9 +102,11 @@ packet_centos7-calico-ha:
when: manual when: manual
packet_centos7-calico-ha-once-localhost: packet_centos7-calico-ha-once-localhost:
stage: deploy-part2 stage: unit-tests
extends: .packet extends: .packet
when: manual when: on_success
services:
- docker:18.09.9-dind
packet_centos7-kube-ovn: packet_centos7-kube-ovn:
stage: deploy-part2 stage: deploy-part2