Adjust BGPCEP test to BGPCEP-877 bug fix

[integration/test.git] / csit / variables / coe / coe_play.yaml

diff --git a/csit/variables/coe/coe_play.yaml b/csit/variables/coe/coe_play.yaml
index 32c9f09d7cc3e2e0f548e575bb3d1dc4a2f2a592..324dbde3ac18ea7e6860ddf48a02a171f978367b 100644 (file)
--- a/csit/variables/coe/coe_play.yaml
+++ b/csit/variables/coe/coe_play.yaml
@@ -1,6 +1,6 @@
 ---
 
-- hosts: coe-master:coe-minion1:coe-minion2
+- hosts: coe-hosts
   vars:
     gopath: "{{ ansible_env.HOME }}/go"
     coe_path: "{{ gopath }}/src/git.opendaylight.org/gerrit/p/coe.git"
@@ -23,21 +23,35 @@
       file:
         path: "{{ ansible_env.HOME }}/go/bin"
         state: directory
-    - name: Install glide
-      shell: curl https://glide.sh/get | sh
-      args:
-        creates: "{{ gopath }}/bin/glide"
+    - name: Show gerrit details
+      run_once: true
+      debug:
+        msg:
+          - "Fetch COE git repository https://git.opendaylight.org/gerrit/p/coe.git"
+          - "gerrit_branch {{ gerrit_branch }}"
+          - "gerrit_refspec {{ gerrit_refspec }}"
     - name: Fetch COE git repository
       git:
-        repo: 'https://git.opendaylight.org/gerrit/p/coe.git'
+        repo: "https://git.opendaylight.org/gerrit/p/coe.git"
+        version: "{{ gerrit_branch }}"
+        refspec: "{{ gerrit_refspec }}"
         dest: "{{ coe_path }}"
-    - name: Fetch odl-cni dependencies with glide
-      shell: glide install -v
+    - name: List COE git repository recent patches
+      run_once: true
+      shell: "git --no-pager log --pretty=format:'%h %<(30)%ad %<(30)%cd %<(20,trunc)%an%d %s' -n10"
       args:
-        chdir: "{{ coe_path }}/odlCNIPlugin/odlovs-cni"
-        creates: "{{ coe_path }}/odlCNIPlugin/odlovs-cni/vendor"
+        chdir: "{{ coe_path }}"
+      register: git_log_output
+    - name: git log header
+      run_once: true
+      debug:
+        msg="Hash    Author Date                    Commit Date                    Author               Subject"
+    - name: git log output
+      run_once: true
+      debug:
+        var=git_log_output.stdout_lines
     - name: Build odlovs-cni
-      shell: go build
+      shell: GO111MODULE=on go build
       args:
         chdir: "{{ coe_path }}/odlCNIPlugin/odlovs-cni"
         creates: "{{ coe_path }}/odlCNIPlugin/odlovs-cni/odlovs-cni"
@@ -58,13 +72,8 @@
     GOPATH: "{{ gopath }}"
     GOROOT: /usr/local/go
   tasks:
-    - name: Fetch watcher dependencies with glide
-      shell: glide install -v
-      args:
-        chdir: "{{ coe_path }}/watcher"
-        creates: "{{ coe_path }}/watcher/vendor"
     - name: Build watcher
-      shell: go build
+      shell: GO111MODULE=on go build
       args:
         chdir: "{{ coe_path }}/watcher"
         creates: "{{ coe_path }}/watcher/watcher"
@@ -83,7 +92,7 @@
         remote_src: true
       become: true
 
-- hosts: coe-master:coe-minion1:coe-minion2
+- hosts: coe-hosts
   tasks:
     - name: Set OVS Manager
       shell: ovs-vsctl set-manager tcp:{{ manager_ip }}:{{ manager_port }} && touch /tmp/ovs-set-manager
@@ -141,7 +150,7 @@
       args:
         creates: /tmp/watcher.out
 
-- hosts: coe-minion1:coe-minion2
+- hosts: coe-minions
   tasks:
     - name: Disable swapfile
       shell: swapoff -a