Update code for latest k8s

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>

contrib/test/integration/e2e.yml

@@ -37,6 +37,20 @@
     path: "{{ artifacts }}"
     state: directory
 
+- name: Add repo for new version of git
+  yum_repository:
+    name: Wandisco
+    description: Wandisco git repo
+    baseurl: http://opensource.wandisco.com/rhel/7Server/git/$basearch
+    gpgcheck: no
+  when: ansible_distribution in ['RedHat']
+
+- name: upgrade git package
+  yum:
+    name: 'git'
+    state: latest
+  when: ansible_distribution in ['RedHat']
+
 # TODO remove the last test skipped once https://github.com/kubernetes-incubator/cri-o/pull/1217 is merged
 - name: Buffer the e2e testing command to workaround Ansible YAML folding "feature"
   set_fact:
@@ -44,7 +58,7 @@
         /usr/bin/go run hack/e2e.go
             --test
             --test_args="-host=https://{{ ansible_default_ipv4.address }}:6443
-                        --ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|PersistentVolumes|\[HPA\]|should.support.building.a.client.with.a.CSR|should.support.inline.execution.and.attach
+                        --ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|PersistentVolumes|\[HPA\]|should.support.building.a.client.with.a.CSR|should.support.inline.execution.and.attach|should.propagate.mounts.to.the.host
                         --report-dir={{ artifacts }}"
             &> {{ artifacts }}/e2e.log
   # Fix vim syntax hilighting: "

contrib/test/integration/main.yml

@@ -59,7 +59,7 @@
       include: "build/cri-tools.yml"
       vars:
         force_clone: True
-        cri_tools_git_version: "f1a58d681c056f259802f5cae2fe1fbcc6b28667"
+        cri_tools_git_version: "240a840375cdabb5860c75c99e8b0d0a776006b4"
     - name: run cri-o integration tests
       include: test.yml
 
@@ -78,7 +78,7 @@
       include: "build/cri-tools.yml"
       vars:
           force_clone: True
-          cri_tools_git_version: "f1a58d681c056f259802f5cae2fe1fbcc6b28667"
+          cri_tools_git_version: "240a840375cdabb5860c75c99e8b0d0a776006b4"
     - name: run critest validation and benchmarks
       include: critest.yml
 
@@ -118,9 +118,8 @@
       include: "build/kubernetes.yml"
       vars:
           force_clone: True
-          # master as of 12/11/2017
-          k8s_git_version: "master-nfs-fix"
-          k8s_github_fork: "runcom"
+          k8s_git_version: "master"
+          k8s_github_fork: "kubernetes"
           crio_socket: "/var/run/crio/crio.sock"
     - name: run k8s e2e tests
       include: e2e.yml