Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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/
Expand All @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions ci-operator/templates/cluster-launch-e2e-upgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ci-operator/templates/cluster-launch-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down