diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-06 13:30:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-06 13:30:57 -0400 |
| commit | 453aab39416ba25b5d57c68ce1baa8035e4c9ff8 (patch) | |
| tree | a159015234cff19689f2ba52a4aec388efc583d3 /contrib | |
| parent | 382b5b81d24870abe400d14296e4f5ef47c99d29 (diff) | |
| parent | 804da7ca07521deb81f5b4bcfe309580ae54b163 (diff) | |
| download | podman-453aab39416ba25b5d57c68ce1baa8035e4c9ff8.tar.gz podman-453aab39416ba25b5d57c68ce1baa8035e4c9ff8.tar.bz2 podman-453aab39416ba25b5d57c68ce1baa8035e4c9ff8.zip | |
Merge pull request #9840 from cevich/new_get_ci_vm.sh
Cirrus: Make use of shared get_ci_vm container
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cirrus/lib.sh | 8 | ||||
| -rwxr-xr-x | contrib/cirrus/runner.sh | 19 |
2 files changed, 18 insertions, 9 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 451a267b3..2cd28e34a 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -13,8 +13,12 @@ set -a _waserrexit=0 if [[ "$SHELLOPTS" =~ errexit ]]; then _waserrexit=1; fi set +e # Assumed in F33 for setting global vars -source /etc/profile -source /etc/environment +if [[ -r "/etc/automation_environment" ]]; then + source /etc/automation_environment +else # prior to automation library v2.0, this was necessary + source /etc/profile + source /etc/environment +fi if [[ -r "/etc/ci_environment" ]]; then source /etc/ci_environment; fi USER="$(whoami)" HOME="$(getent passwd $USER | cut -d : -f 6)" diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index f52e107cc..8d3a6b987 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -269,13 +269,18 @@ function _run_release() { } logformatter() { - # Use similar format as human-friendly task name from .cirrus.yml - # shellcheck disable=SC2154 - output_name="$TEST_FLAVOR-$PODBIN_NAME-$DISTRO_NV-$PRIV_NAME-$TEST_ENVIRON" - # Requires stdin and stderr combined! - cat - \ - |& awk --file "${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/timestamp.awk" \ - |& "${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/logformatter" "$output_name" + if [[ "$CI" == "true" ]]; then + # Use similar format as human-friendly task name from .cirrus.yml + # shellcheck disable=SC2154 + output_name="$TEST_FLAVOR-$PODBIN_NAME-$DISTRO_NV-$PRIV_NAME-$TEST_ENVIRON" + # Requires stdin and stderr combined! + cat - \ + |& awk --file "${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/timestamp.awk" \ + |& "${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/logformatter" "$output_name" + else + # Assume script is run by a human, they want output immediatly + cat - + fi } # Handle local|remote integration|system testing in a uniform way |