X-Git-Url: https://git.arvados.org/arvados-formula.git/blobdiff_plain/79275e49ecb75fc5e72625fd2760146f856ad517..b47321d42a46046c78b237d9adc9be4ba638887f:/test/salt/states/examples/arvados/shell/cron/add-login-sync.sls diff --git a/test/salt/states/examples/arvados/shell/cron/add-login-sync.sls b/test/salt/states/examples/arvados/shell/cron/add-login-sync.sls index 353ac6a..fdcf599 100644 --- a/test/salt/states/examples/arvados/shell/cron/add-login-sync.sls +++ b/test/salt/states/examples/arvados/shell/cron/add-login-sync.sls @@ -47,7 +47,7 @@ examples-arvados-shell-cron-add-login-sync-add-{{ vm }}-get-vm_uuid-cmd-run: - require: - cmd: examples-arvados-shell-cron-add-login-sync-add-resources-virtual-machines-{{ vm }}-record-cmd-run - unless: - - /bin/grep -qE "fixme-2x53u-[a-z0-9]{15}" /tmp/{{ vm }} + - /bin/grep -qE "[a-z0-9]{5}-2x53u-[a-z0-9]{15}" /tmp/{{ vm }} # There's no direct way to query the scoped_token for a given virtual_machine # so we need to parse the api_client_authorization list through some jq @@ -68,7 +68,7 @@ examples-arvados-shell-cron-add-login-sync-add-{{ vm }}-get-scoped_token-cmd-run - require: - cmd: examples-arvados-shell-cron-add-login-sync-add-{{ vm }}-get-vm_uuid-cmd-run - unless: - - test -s /tmp/sctk-{{ vm }} + - test -s /tmp/sctk{{ vm }} examples-arvados-shell-cron-add-login-sync-add-{{ vm }}-arvados-host-cron-env-present: cron.env_present: