diff --git a/ci-operator/templates/cluster-launch-e2e-openshift-ansible.yaml b/ci-operator/templates/cluster-launch-e2e-openshift-ansible.yaml index bdf41d13fdf41..bec434c268c6b 100644 --- a/ci-operator/templates/cluster-launch-e2e-openshift-ansible.yaml +++ b/ci-operator/templates/cluster-launch-e2e-openshift-ansible.yaml @@ -45,6 +45,7 @@ objects: annotations: # we want to gather the teardown logs no matter what ci-operator.openshift.io/wait-for-container-artifacts: teardown + ci-operator.openshift.io/always-show-output: "true" spec: restartPolicy: Never activeDeadlineSeconds: 10800 @@ -186,7 +187,7 @@ objects: #!/bin/bash set -euo pipefail - trap 'rc=$?; gzip /tmp/artifacts/*.log; if [[ $rc -ne 0 ]]; then touch /tmp/shared/exit; fi; exit $rc' EXIT + trap 'rc=$?; if [[ $rc -ne 0 ]]; then touch /tmp/shared/exit; fi; exit $rc' EXIT trap 'kill $(jobs -p); exit 0' TERM cd /usr/share/ansible/openshift-ansible/ @@ -204,7 +205,7 @@ objects: ansible-playbook -vvv \ -e "openshift_test_repo=${RPM_REPO_OPENSHIFT_ORIGIN}" \ -i test/ci/inventory \ - test/ci/launch.yml | tee -a /tmp/artifacts/ansible.log + test/ci/launch.yml # Create a new cluster-admin user ansible -i test/ci/inventory "masters[0]" -m command \ diff --git a/ci-operator/templates/cluster-launch-e2e-upgrade.yaml b/ci-operator/templates/cluster-launch-e2e-upgrade.yaml index 2c5c9dd32aea5..e8b61b345f73f 100644 --- a/ci-operator/templates/cluster-launch-e2e-upgrade.yaml +++ b/ci-operator/templates/cluster-launch-e2e-upgrade.yaml @@ -50,6 +50,7 @@ objects: annotations: # we want to gather the teardown logs no matter what ci-operator.openshift.io/wait-for-container-artifacts: teardown + ci-operator.openshift.io/always-show-output: "true" spec: restartPolicy: Never activeDeadlineSeconds: 10800 diff --git a/ci-operator/templates/cluster-launch-e2e.yaml b/ci-operator/templates/cluster-launch-e2e.yaml index accb4b6e89690..7c762597525bf 100644 --- a/ci-operator/templates/cluster-launch-e2e.yaml +++ b/ci-operator/templates/cluster-launch-e2e.yaml @@ -44,6 +44,7 @@ objects: annotations: # we want to gather the teardown logs no matter what ci-operator.openshift.io/wait-for-container-artifacts: teardown + ci-operator.openshift.io/always-show-output: "true" spec: restartPolicy: Never activeDeadlineSeconds: 10800