Merge pull request #529 from runcom/k8s-node-e2e-RHEL

enable RHEL k8s node-e2e tests

contrib/test/crio-integration-playbook.yaml

@@ -179,13 +179,13 @@
       chdir: /root/src/github.com/containernetworking/plugins
   - name: cp bin to cni bin dir
     shell: cp /root/src/github.com/containernetworking/plugins/bin/* /opt/cni/bin
-  - name: curl ocid bridge conf file for cni networking
+  - name: curl crio bridge conf file for cni networking
     get_url:
-      url: https://raw.githubusercontent.com/kubernetes-incubator/cri-o/master/contrib/cni/10-ocid-bridge.conf
+      url: https://raw.githubusercontent.com/kubernetes-incubator/cri-o/{{ commit }}/contrib/cni/10-crio-bridge.conf
-      dest: /etc/cni/net.d/10-ocid-bridge.conf
+      dest: /etc/cni/net.d/10-crio-bridge.conf
   - name: curl loopback conf for cni networking
     get_url:
-      url: https://raw.githubusercontent.com/kubernetes-incubator/cri-o/master/contrib/cni/99-loopback.conf
+      url: https://raw.githubusercontent.com/kubernetes-incubator/cri-o/{{ commit }}/contrib/cni/99-loopback.conf
       dest: /etc/cni/net.d/99-loopback.conf
   - name: make clean
     make:
@@ -258,11 +258,14 @@
     shell: 'mv /root/src/github.com/kubernetes-incubator/cri-o/test/TestReport-bats*.xml /root/src/github.com/kubernetes-incubator/cri-o/reports/'
     when: xunit
   # XXX: kube tests from now on
+  # TODO: remove custom repo origin and put kube master back after PR #510
+  #       we need this because of node-e2e tests failing on RHEL otherwise
+  #       For more info see issue #529
   - name: git clone k8s repo
     git:
-      repo: https://github.com/kubernetes/kubernetes
+      repo: https://github.com/runcom/kubernetes
       dest: /root/src/k8s.io/kubernetes
-      version: 2899f47bc
+      version: custom-RHEL-node-e2e
       force: yes
     async: 600
     poll: 10
@@ -298,7 +301,7 @@
       insertafter: 'storage_option = \['
       regexp: 'overlay2\.override_kernel_check=1'
       state: present
-    when: ansible_distribution == 'RHEL' or ansible_distribution == 'CentOS'
+    when: ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS'
   - name: enable and start CRI-O
     systemd:
       name: crio
@@ -307,6 +310,7 @@
       daemon_reload: yes
     async: 600
     poll: 10
+  # see https://github.com/kubernetes-incubator/cri-o/issues/528
   - name: disable selinux for k8s conformance tests
     shell: |
             setenforce 0
@@ -357,4 +361,4 @@
     poll: 10
     ignore_errors: true
     # XXX: tests on RHEL/CentOS are unreliable fow now
-    when: ansible_distribution == 'Fedora'
+    when: ansible_distribution == 'Fedora' or ansible_distribution == 'RedHat'

test/image.bats

@@ -86,26 +86,26 @@ function teardown() {
 
 @test "image pull and list by digest" {
 	start_crio "" "" --no-pause-image
-	run crioctl image pull nginx@sha256:4aacdcf186934dcb02f642579314075910f1855590fd3039d8fa4c9f96e48315
+	run crioctl image pull nginx@sha256:33eb1ed1e802d4f71e52421f56af028cdf12bb3bfff5affeaf5bf0e328ffa1bc
 	echo "$output"
 	[ "$status" -eq 0 ]
 
-	run crioctl image list --quiet nginx@sha256:4aacdcf186934dcb02f642579314075910f1855590fd3039d8fa4c9f96e48315
+	run crioctl image list --quiet nginx@sha256:33eb1ed1e802d4f71e52421f56af028cdf12bb3bfff5affeaf5bf0e328ffa1bc
 	[ "$status" -eq 0 ]
 	echo "$output"
 	[ "$output" != "" ]
 
-	run crioctl image list --quiet nginx@4aacdcf186934dcb02f642579314075910f1855590fd3039d8fa4c9f96e48315
+	run crioctl image list --quiet nginx@33eb1ed1e802d4f71e52421f56af028cdf12bb3bfff5affeaf5bf0e328ffa1bc
 	[ "$status" -eq 0 ]
 	echo "$output"
 	[ "$output" != "" ]
 
-	run crioctl image list --quiet @4aacdcf186934dcb02f642579314075910f1855590fd3039d8fa4c9f96e48315
+	run crioctl image list --quiet @33eb1ed1e802d4f71e52421f56af028cdf12bb3bfff5affeaf5bf0e328ffa1bc
 	[ "$status" -eq 0 ]
 	echo "$output"
 	[ "$output" != "" ]
 
-	run crioctl image list --quiet 4aacdcf186934dcb02f642579314075910f1855590fd3039d8fa4c9f96e48315
+	run crioctl image list --quiet 33eb1ed1e802d4f71e52421f56af028cdf12bb3bfff5affeaf5bf0e328ffa1bc
 	[ "$status" -eq 0 ]
 	echo "$output"
 	[ "$output" != "" ]