diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-03 02:14:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-03 02:14:30 +0200 |
| commit | d9d9c82184ad6d7e3fad07dfe2e99b158560d3a8 (patch) | |
| tree | 32f6ace3dafa6fc0c0897dfeb2161d3f8e12ae69 /contrib/cirrus/lib.sh | |
| parent | f3c494eb2824d6c12bdefe2266eab4f6d656005a (diff) | |
| parent | 074a26f7a16770666095600d2dac252fbf2cb3e6 (diff) | |
| download | podman-d9d9c82184ad6d7e3fad07dfe2e99b158560d3a8.tar.gz podman-d9d9c82184ad6d7e3fad07dfe2e99b158560d3a8.tar.bz2 podman-d9d9c82184ad6d7e3fad07dfe2e99b158560d3a8.zip | |
Merge pull request #2849 from cevich/timestamps
Cirrus: timestamp all output script output
Diffstat (limited to 'contrib/cirrus/lib.sh')
| -rw-r--r-- | contrib/cirrus/lib.sh | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 1c459ebc7..f422fe935 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -17,7 +17,6 @@ PACKER_BASE=${PACKER_BASE:-./contrib/cirrus/packer} CIRRUS_BUILD_ID=${CIRRUS_BUILD_ID:-DEADBEEF} # a human CIRRUS_BASE_SHA=${CIRRUS_BASE_SHA:-HEAD} CIRRUS_CHANGE_IN_REPO=${CIRRUS_CHANGE_IN_REPO:-FETCH_HEAD} -TIMESTAMPS_FILEPATH="${TIMESTAMPS_FILEPATH:-/var/tmp/timestamps}" SPECIALMODE="${SPECIALMODE:-none}" export CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-podman} @@ -153,16 +152,6 @@ ircmsg() { set -e } -record_timestamp() { - set +x # sometimes it's turned on - req_env_var TIMESTAMPS_FILEPATH - echo "." # cirrus webui strips blank-lines - STAMPMSG="The $1 time at the tone will be:" - echo -e "$STAMPMSG\t$(date --iso-8601=seconds)" | \ - tee -a $TIMESTAMPS_FILEPATH - echo -e "BLEEEEEEEEEEP!\n." -} - setup_rootless() { req_env_var ROOTLESS_USER GOSRC ENVLIB @@ -203,9 +192,6 @@ setup_rootless() { echo "${ROOTLESS_USER}:$[ROOTLESS_UID * 100]:65536" | \ tee -a /etc/subuid >> /etc/subgid - echo "Setting permissions on automation files" - chmod 666 "$TIMESTAMPS_FILEPATH" - echo "Copying $HOME/$ENVLIB" install -o $ROOTLESS_USER -g $ROOTLESS_USER -m 0700 \ "$HOME/$ENVLIB" "/home/$ROOTLESS_USER/$ENVLIB" |