Re-Add docker:dind for Packet CI (#4567)
This commit is contained in:
parent
f142e671b3
commit
026088deea
3 changed files with 5 additions and 6 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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-.*$/]
|
||||
|
||||
|
|
Loading…
Reference in a new issue