Switch watcher from glide to dep

With https://git.opendaylight.org/gerrit/#/c/72855/
COE will switch from glide to dep. Adapt to the
same change in CSIT as well. The current playbook
fetches the above patch so that we can test this in sandbox.
Once verified, the patch checkout will be removed.

Change-Id: I59901cdd909aa40e4de5f0b97b32c1b9a83333ac
Signed-off-by: Faseela K <faseela.k@ericsson.com>
Signed-off-by: Frederick F. Kautz IV <fkautz@redhat.com>

diff --git a/csit/variables/coe/coe_play.yaml b/csit/variables/coe/coe_play.yaml
index 32c9f09d7cc3e2e0f548e575bb3d1dc4a2f2a592..ea95db4bbbb349118ff71f2fa81a7f37b96498bc 100644 (file)
--- a/csit/variables/coe/coe_play.yaml
+++ b/csit/variables/coe/coe_play.yaml
@@ -23,16 +23,21 @@
       file:
         path: "{{ ansible_env.HOME }}/go/bin"
         state: directory
       file:
         path: "{{ ansible_env.HOME }}/go/bin"
         state: directory

-    - name: Install glide
-      shell: curl https://glide.sh/get | sh
+    - name: Install dep
+      shell: curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh

       args:
       args:

-        creates: "{{ gopath }}/bin/glide"
+        creates: "{{ gopath }}/bin/dep"

     - name: Fetch COE git repository
       git:
         repo: 'https://git.opendaylight.org/gerrit/p/coe.git'
         dest: "{{ coe_path }}"
     - name: Fetch COE git repository
       git:
         repo: 'https://git.opendaylight.org/gerrit/p/coe.git'
         dest: "{{ coe_path }}"

-    - name: Fetch odl-cni dependencies with glide
-      shell: glide install -v
+    - name: Fetch COE dep patch
+      shell: git config --add user.name "vagrant" && git config --add user.email "coe@local" && git fetch https://git.opendaylight.org/gerrit/coe refs/changes/55/72855/4 && git cherry-pick FETCH_HEAD && touch /tmp/coe-patched
+      args:
+        chdir: "{{ coe_path }}"
+        creates: /tmp/coe-patched
+    - name: Fetch odl-cni dependencies with dep
+      shell: dep ensure -vendor-only

       args:
         chdir: "{{ coe_path }}/odlCNIPlugin/odlovs-cni"
         creates: "{{ coe_path }}/odlCNIPlugin/odlovs-cni/vendor"
       args:
         chdir: "{{ coe_path }}/odlCNIPlugin/odlovs-cni"
         creates: "{{ coe_path }}/odlCNIPlugin/odlovs-cni/vendor"


@@ -58,8 +63,8 @@
     GOPATH: "{{ gopath }}"
     GOROOT: /usr/local/go
   tasks:
     GOPATH: "{{ gopath }}"
     GOROOT: /usr/local/go
   tasks:

-    - name: Fetch watcher dependencies with glide
-      shell: glide install -v
+    - name: Fetch watcher dependencies with dep
+      shell: dep ensure -vendor-only

       args:
         chdir: "{{ coe_path }}/watcher"
         creates: "{{ coe_path }}/watcher/vendor"
       args:
         chdir: "{{ coe_path }}/watcher"
         creates: "{{ coe_path }}/watcher/vendor"