From 440b4074d22e6507e9266a6cfc4b7c3e123a1764 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Thu, 21 Sep 2017 12:16:54 -0600 Subject: [PATCH] Integration tests: fix stderr logging Three shell commands were being run with '2>&1 >logfile'. This is usually a mistake: it logs stdout only, with stderr going to the original stdout. This PR reverses the order, such that both stdout and stderr are redirected to logfile Signed-off-by: Ed Santiago --- contrib/test/crio-integration-playbook.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/test/crio-integration-playbook.yaml b/contrib/test/crio-integration-playbook.yaml index 0ba7beaf..603897d6 100644 --- a/contrib/test/crio-integration-playbook.yaml +++ b/contrib/test/crio-integration-playbook.yaml @@ -275,7 +275,7 @@ src: /root/src/github.com/kubernetes-incubator/cri-o/test/policy.json dest: /etc/containers/policy.json - name: run integration tests RHEL - shell: 'CGROUP_MANAGER=cgroupfs STORAGE_OPTS="--storage-driver=overlay2 --storage-opt overlay2.override_kernel_check=1" make localintegration 2>&1 > testout.txt' + shell: 'CGROUP_MANAGER=cgroupfs STORAGE_OPTS="--storage-driver=overlay2 --storage-opt overlay2.override_kernel_check=1" make localintegration > testout.txt 2>&1' args: chdir: /root/src/github.com/kubernetes-incubator/cri-o async: 3600 @@ -291,7 +291,7 @@ ignore_errors: yes when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and xunit - name: run integration tests Fedora - shell: 'CGROUP_MANAGER=cgroupfs STORAGE_OPTS="--storage-driver=overlay2" make localintegration 2>&1 > testout.txt' + shell: 'CGROUP_MANAGER=cgroupfs STORAGE_OPTS="--storage-driver=overlay2" make localintegration > testout.txt 2>&1' args: chdir: /root/src/github.com/kubernetes-incubator/cri-o async: 3600 @@ -523,7 +523,7 @@ # So, we'll change it to "e2e.log", some day... - name: run e2e tests shell: | - go run hack/e2e.go -v --test -test_args="-host=https://{{ ansible_default_ipv4.address }}:6443 --ginkgo.focus=\[Conformance\]" 2>&1 > node-e2e.log + go run hack/e2e.go -v --test -test_args="-host=https://{{ ansible_default_ipv4.address }}:6443 --ginkgo.focus=\[Conformance\]" > node-e2e.log 2>&1 args: chdir: /root/src/k8s.io/kubernetes async: 7200