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

Re-Add docker:dind for Packet CI (#4567)

Browse source
This commit is contained in:
Maxime Guyot 2019-04-20 15:19:40 +02:00 committed by Kubernetes Prow Robot
parent f142e671b3
commit 026088deea
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -39,6 +39,8 @@ before_script:
.testcases: &testcases .testcases: &testcases
<<: *job <<: *job
services:
- docker:dind
before_script: before_script:
- /usr/bin/python -m pip install -r tests/requirements.txt - /usr/bin/python -m pip install -r tests/requirements.txt
- mkdir -p /.ssh - mkdir -p /.ssh
@ -52,6 +54,8 @@ before_script:
- ls - ls
- echo ${PWD} - echo ${PWD}
- echo "${STARTUP_SCRIPT}" - 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 - - cd tests && make create-${CI_PLATFORM} -s ; cd -
# Check out latest tag if testing upgrade # Check out latest tag if testing upgrade

5
.gitlab-ci/gce.yml
View file

@ -6,10 +6,6 @@
CI_PLATFORM: "gce" CI_PLATFORM: "gce"
PRIVATE_KEY: $GCE_PRIVATE_KEY PRIVATE_KEY: $GCE_PRIVATE_KEY
.docker_service: &docker_service
services:
- docker:dind
.cache: &cache .cache: &cache
cache: cache:
key: "$CI_BUILD_REF_NAME" key: "$CI_BUILD_REF_NAME"
@ -19,7 +15,6 @@
.gce: &gce .gce: &gce
extends: .testcases extends: .testcases
<<: *docker_service
<<: *cache <<: *cache
variables: variables:
<<: *gce_variables <<: *gce_variables

2
.gitlab-ci/packet.yml
View file

@ -104,7 +104,7 @@ packet_rhel7-canal-sep:
packet_centos7-calico-ha: packet_centos7-calico-ha:
stage: deploy-special stage: deploy-special
<<: *packet <<: *packet
when: manual when: on_success
except: ['triggers'] except: ['triggers']
only: ['master', /^pr-.*$/] only: ['master', /^pr-.*$/]