diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-16 22:16:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-16 22:16:24 +0200 |
| commit | fe833086313335f88a9aada54890a83077ff41bf (patch) | |
| tree | a65afd4f4da1f126523f278e2462967d9adcaf07 /contrib/cirrus/lib.sh | |
| parent | 400851ac31a57f43916c4a1b653a33737f1e7e3b (diff) | |
| parent | f58b754c8d3a45b8d9123c624bf299b87285c3bf (diff) | |
| download | podman-fe833086313335f88a9aada54890a83077ff41bf.tar.gz podman-fe833086313335f88a9aada54890a83077ff41bf.tar.bz2 podman-fe833086313335f88a9aada54890a83077ff41bf.zip | |
Merge pull request #3548 from cevich/disable_periodic_activity
Cirrus: Disable most periodic services/timers
Diffstat (limited to 'contrib/cirrus/lib.sh')
| -rw-r--r-- | contrib/cirrus/lib.sh | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 4acdb460a..a9da3f4ce 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -78,6 +78,9 @@ ROOTLESS_ENV_RE='(CIRRUS_.+)|(ROOTLESS_.+)|(.+_IMAGE.*)|(.+_BASE)|(.*DIRPATH)|(. # Unsafe env. vars for display SECRET_ENV_RE='(IRCID)|(ACCOUNT)|(^GC[EP]..+)|(SSH)' +# Names of systemd units which should never be running +EVIL_UNITS="cron crond atd apt-daily-upgrade apt-daily fstrim motd-news systemd-tmpfiles-clean" + SPECIALMODE="${SPECIALMODE:-none}" TEST_REMOTE_CLIENT="${TEST_REMOTE_CLIENT:-false}" export CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-podman} @@ -350,6 +353,20 @@ remove_packaged_podman_files(){ done } +systemd_banish(){ + echo "Disabling periodic services that could destabilize testing:" + set +e # Not all of these exist on every platform + for unit in $EVIL_UNITS + do + ooe.sh sudo systemctl stop $unit + ooe.sh sudo systemctl disable $unit + ooe.sh sudo systemctl disable $unit.timer + ooe.sh sudo systemctl mask $unit + ooe.sh sudo systemctl mask $unit.timer + done + set -e +} + _finalize(){ set +e # Don't fail at the very end set +e # make errors non-fatal |