Remove dind requirement from argo-ci test steps

sivam1 · Jan 18, 2018 · a373903 · a373903
1 parent 1bdd0c0
commit a373903
Showing 1 changed file with 29 additions and 4 deletions.
diff --git a/.argo-ci/ci.yaml b/.argo-ci/ci.yaml
@@ -14,18 +14,25 @@ spec:
  templates:
  - name: argo-ci
  steps:
- - - name: ci
- template: ci-builder
+ - - name: build
+ template: ci-dind
  arguments:
  parameters:
  - name: cmd
  value: "{{item}}"
  withItems:
  - make controller-image
  - make executor-image
+ - make ui-image
  - make cli-linux
  - make cli-darwin
- - make ui-image
+ - name: test
+ template: ci-builder
+ arguments:
+ parameters:
+ - name: cmd
+ value: "{{item}}"
+ withItems:
  - dep ensure && make lint
  - dep ensure && make test
  - dep ensure && ./hack/verify-codegen.sh
@@ -43,7 +50,24 @@ spec:
  container:
  image: argoproj/argo-ci-builder:1.0
  command: [sh, -c]
- args: ["until docker ps; do sleep 3; done; cd /go/src/github.com/argoproj/argo && {{inputs.parameters.cmd}}"]
+ args: ["{{inputs.parameters.cmd}}"]
+ workingDir: /go/src/github.com/argoproj/argo
+
+ - name: ci-dind
+ inputs:
+ parameters:
+ - name: cmd
+ artifacts:
+ - name: code
+ path: /go/src/github.com/argoproj/argo
+ git:
+ repo: "{{workflow.parameters.repo}}"
+ revision: "{{workflow.parameters.revision}}"
+ container:
+ image: argoproj/argo-ci-builder:1.0
+ command: [sh, -c]
+ args: ["until docker ps; do sleep 3; done && {{inputs.parameters.cmd}}"]
+ workingDir: /go/src/github.com/argoproj/argo
  env:
  - name: DOCKER_HOST
  value: 127.0.0.1
@@ -53,3 +77,4 @@ spec:
  securityContext:
  privileged: true
  mirrorVolumeMounts: true
+