From 3761cf8e86a6d4f0b7f43127fbc397e9f887744a Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Mon, 6 Nov 2017 15:36:46 -0500
Subject: [PATCH] Utilize git_repo_cloned + vars for all repos

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 contrib/test/integration/build/bats.yml       |  5 -----
 contrib/test/integration/build/cri-tools.yml  |  6 -----
 contrib/test/integration/build/kubernetes.yml |  6 -----
 contrib/test/integration/build/plugins.yml    |  6 -----
 contrib/test/integration/build/runc.yml       |  6 -----
 contrib/test/integration/main.yml             | 15 +++++++++++--
 contrib/test/integration/vars.yml             | 22 +++++++++++++++++++
 7 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/contrib/test/integration/build/bats.yml b/contrib/test/integration/build/bats.yml
index d4ea19c6..7f947805 100644
--- a/contrib/test/integration/build/bats.yml
+++ b/contrib/test/integration/build/bats.yml
@@ -1,10 +1,5 @@
 ---
 
-- name: clone bats source repo
-  git:
-    repo: "https://github.com/sstephenson/bats.git"
-    dest: "{{ ansible_env.GOPATH }}/src/github.com/sstephenson/bats"
-
 - name: install bats
   command: "./install.sh /usr/local"
   args:
diff --git a/contrib/test/integration/build/cri-tools.yml b/contrib/test/integration/build/cri-tools.yml
index 9a117f3c..034081f2 100644
--- a/contrib/test/integration/build/cri-tools.yml
+++ b/contrib/test/integration/build/cri-tools.yml
@@ -1,11 +1,5 @@
 ---
 
-- name: clone cri-tools source repo
-  git:
-    repo: "https://github.com/kubernetes-incubator/cri-tools.git"
-    dest: "{{ ansible_env.GOPATH }}/src/github.com/kubernetes-incubator/cri-tools"
-    version: "9ff5e8f78a4182ab8d5ba9bcccdda5f338600eab"
-
 - name: install crictl
   command: "/usr/bin/go install github.com/kubernetes-incubator/cri-tools/cmd/crictl"
 
diff --git a/contrib/test/integration/build/kubernetes.yml b/contrib/test/integration/build/kubernetes.yml
index f724230c..07d22f8d 100644
--- a/contrib/test/integration/build/kubernetes.yml
+++ b/contrib/test/integration/build/kubernetes.yml
@@ -1,11 +1,5 @@
 ---
 
-- name: clone kubernetes source repo
-  git:
-    repo: "https://github.com/runcom/kubernetes.git"
-    dest: "{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes"
-    version: "cri-o-patched-1.8"
-
 - name: install etcd
   command: "hack/install-etcd.sh"
   args:
diff --git a/contrib/test/integration/build/plugins.yml b/contrib/test/integration/build/plugins.yml
index e342a0b9..fc4f7bd1 100644
--- a/contrib/test/integration/build/plugins.yml
+++ b/contrib/test/integration/build/plugins.yml
@@ -1,11 +1,5 @@
 ---
 
-- name: clone plugins source repo
-  git:
-    repo: "https://github.com/containernetworking/plugins.git"
-    dest: "{{ ansible_env.GOPATH }}/src/github.com/containernetworking/plugins"
-    version: "dcf7368eeab15e2affc6256f0bb1e84dd46a34de"
-
 - name: build plugins
   command: "./build.sh"
   args:
diff --git a/contrib/test/integration/build/runc.yml b/contrib/test/integration/build/runc.yml
index 7bb0491d..c6cc8c94 100644
--- a/contrib/test/integration/build/runc.yml
+++ b/contrib/test/integration/build/runc.yml
@@ -1,11 +1,5 @@
 ---
 
-- name: clone runc source repo
-  git:
-    repo: "https://github.com/opencontainers/runc.git"
-    dest: "{{ ansible_env.GOPATH }}/src/github.com/opencontainers/runc"
-    version: "84a082bfef6f932de921437815355186db37aeb1"
-
 - name: build runc
   make:
     params: BUILDTAGS="seccomp selinux"
diff --git a/contrib/test/integration/main.yml b/contrib/test/integration/main.yml
index ce4a206f..4d26baa0 100644
--- a/contrib/test/integration/main.yml
+++ b/contrib/test/integration/main.yml
@@ -4,13 +4,19 @@
     - "{{ playbook_dir }}/vars.yml"
   tags:
     - setup
-  tasks:
+  pre_tasks:
     - name: set up the system
       include: system.yml
 
     - name: install Golang tools
       include: golang.yml
 
+  roles:
+    - role: git_repo_cloned
+      git_ops: '{{ git_operations }}'
+      always_force: False
+
+  post_tasks:
     - name: clone build and install bats
       include: "build/bats.yml"
 
@@ -33,7 +39,12 @@
   tags:
     - integration
     - e2e
-  tasks:
+  roles:
+    - role: git_repo_cloned
+      git_ops: '{{ git_operations }}'
+      always_force: True
+
+  post_tasks:
     - name: clone build and install cri-o
       include: "build/cri-o.yml"
 
diff --git a/contrib/test/integration/vars.yml b/contrib/test/integration/vars.yml
index f1e5e2f7..5578adca 100644
--- a/contrib/test/integration/vars.yml
+++ b/contrib/test/integration/vars.yml
@@ -1,5 +1,27 @@
 ---
 
+# List of repositories to clone.  Each item accepts any option or value supported
+# by Ansible's ``git`` module.
+git_operations:
+    - repo: "https://github.com/sstephenson/bats.git"
+      dest: "{{ ansible_env.GOPATH }}/src/github.com/sstephenson/bats"
+
+    - repo: "https://github.com/kubernetes-incubator/cri-tools.git"
+      dest: "{{ ansible_env.GOPATH }}/src/github.com/kubernetes-incubator/cri-tools"
+      version: "9ff5e8f78a4182ab8d5ba9bcccdda5f338600eab"
+
+    - repo: "https://github.com/runcom/kubernetes.git"
+      dest: "{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes"
+      version: "cri-o-patched-1.8"
+
+    - repo: "https://github.com/containernetworking/plugins.git"
+      dest: "{{ ansible_env.GOPATH }}/src/github.com/containernetworking/plugins"
+      version: "dcf7368eeab15e2affc6256f0bb1e84dd46a34de"
+
+    - repo: "https://github.com/opencontainers/runc.git"
+      dest: "{{ ansible_env.GOPATH }}/src/github.com/opencontainers/runc"
+      version: "84a082bfef6f932de921437815355186db37aeb1"
+
 # For results.yml Paths use rsync 'source' conventions
 artifacts: "/tmp/artifacts"  # Base-directory for collection
 crio_integration_filepath: "{{ artifacts }}/testout.txt"