From bbd7286240c2f604e9c1a6bb027e696fc973f74f Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 26 Mar 2021 17:59:40 +0000 Subject: [PATCH] refactor(retry_options): provide options from defaults/pillar --- pillar.example | 7 +++++++ salt/defaults.yaml | 7 +++++++ salt/master.sls | 6 +----- salt/minion.sls | 12 ++---------- .../v3000-py2/files/_mapdata/ubuntu-16.yaml | 5 +++++ .../v3000-py2/files/_mapdata/ubuntu-18.yaml | 5 +++++ .../v3000-py3/files/_mapdata/amazonlinux-2.yaml | 5 +++++ .../v3000-py3/files/_mapdata/centos-7.yaml | 5 +++++ .../v3000-py3/files/_mapdata/centos-8.yaml | 5 +++++ .../v3000-py3/files/_mapdata/debian-10.yaml | 5 +++++ .../v3000-py3/files/_mapdata/debian-9.yaml | 5 +++++ .../v3000-py3/files/_mapdata/gentoo-2-sysd.yaml | 5 +++++ .../v3000-py3/files/_mapdata/gentoo-2-sysv.yaml | 5 +++++ .../v3000-py3/files/_mapdata/opensuse-15.yaml | 5 +++++ .../v3000-py3/files/_mapdata/oraclelinux-7.yaml | 5 +++++ .../v3000-py3/files/_mapdata/oraclelinux-8.yaml | 5 +++++ .../v3000-py3/files/_mapdata/ubuntu-16.yaml | 5 +++++ .../v3000-py3/files/_mapdata/ubuntu-18.yaml | 5 +++++ .../files/_mapdata/windows-2019-server.yaml | 5 +++++ .../v3001-py3/files/_mapdata/amazonlinux-2.yaml | 5 +++++ .../v3001-py3/files/_mapdata/centos-7.yaml | 5 +++++ .../v3001-py3/files/_mapdata/centos-8.yaml | 5 +++++ .../v3001-py3/files/_mapdata/debian-10.yaml | 5 +++++ .../v3001-py3/files/_mapdata/debian-9.yaml | 5 +++++ .../v3001-py3/files/_mapdata/fedora-32.yaml | 5 +++++ .../v3001-py3/files/_mapdata/fedora-33.yaml | 5 +++++ .../v3001-py3/files/_mapdata/gentoo-2-sysd.yaml | 5 +++++ .../v3001-py3/files/_mapdata/gentoo-2-sysv.yaml | 5 +++++ .../v3001-py3/files/_mapdata/opensuse-15.yaml | 5 +++++ .../files/_mapdata/opensuse-tumbleweed.yaml | 5 +++++ .../v3001-py3/files/_mapdata/oraclelinux-7.yaml | 5 +++++ .../v3001-py3/files/_mapdata/oraclelinux-8.yaml | 5 +++++ .../v3001-py3/files/_mapdata/ubuntu-16.yaml | 5 +++++ .../v3001-py3/files/_mapdata/ubuntu-18.yaml | 5 +++++ .../v3001-py3/files/_mapdata/ubuntu-20.yaml | 5 +++++ .../v3002-py3/files/_mapdata/amazonlinux-2.yaml | 5 +++++ .../v3002-py3/files/_mapdata/arch-base-latest.yaml | 5 +++++ .../v3002-py3/files/_mapdata/centos-7.yaml | 5 +++++ .../v3002-py3/files/_mapdata/centos-8.yaml | 5 +++++ .../v3002-py3/files/_mapdata/debian-10.yaml | 5 +++++ .../v3002-py3/files/_mapdata/debian-9.yaml | 5 +++++ .../v3002-py3/files/_mapdata/fedora-32.yaml | 5 +++++ .../v3002-py3/files/_mapdata/fedora-33.yaml | 5 +++++ .../v3002-py3/files/_mapdata/gentoo-2-sysd.yaml | 5 +++++ .../v3002-py3/files/_mapdata/gentoo-2-sysv.yaml | 5 +++++ .../v3002-py3/files/_mapdata/opensuse-15.yaml | 5 +++++ .../files/_mapdata/opensuse-tumbleweed.yaml | 5 +++++ .../v3002-py3/files/_mapdata/oraclelinux-7.yaml | 5 +++++ .../v3002-py3/files/_mapdata/oraclelinux-8.yaml | 5 +++++ .../v3002-py3/files/_mapdata/ubuntu-16.yaml | 5 +++++ .../v3002-py3/files/_mapdata/ubuntu-18.yaml | 5 +++++ .../v3002-py3/files/_mapdata/ubuntu-20.yaml | 5 +++++ .../files/_mapdata/windows-2016-server.yaml | 5 +++++ .../files/_mapdata/windows-2019-server.yaml | 5 +++++ .../v3002-py3/files/_mapdata/windows-8.yaml | 5 +++++ 55 files changed, 272 insertions(+), 15 deletions(-) diff --git a/pillar.example b/pillar.example index 5860152..748eb27 100644 --- a/pillar.example +++ b/pillar.example @@ -369,6 +369,13 @@ salt: - 'deploy': - /srv/salt/reactors/deploy.sls + # https://docs.saltstack.com/en/latest/ref/states/requisites.html#retrying-states + retry_options: + attempts: 2 + until: true + interval: 10 + splay: 10 + salt_cloud_certs: aws: pem: | diff --git a/salt/defaults.yaml b/salt/defaults.yaml index b35c418..cc225c1 100644 --- a/salt/defaults.yaml +++ b/salt/defaults.yaml @@ -85,6 +85,13 @@ salt: profiles: salt://salt/files/cloud.profiles.d maps: salt://salt/files/cloud.maps.d + # https://docs.saltstack.com/en/latest/ref/states/requisites.html#retrying-states + retry_options: + attempts: 2 + until: true + interval: 10 + splay: 10 + salt_formulas: list: {} # via pillar data checkout_orig_branch: false diff --git a/salt/master.sls b/salt/master.sls index 3a6835d..13cc5a8 100644 --- a/salt/master.sls +++ b/salt/master.sls @@ -15,11 +15,7 @@ salt-master-macos: - name: /Library/LaunchDaemons/com.saltstack.salt.master.plist - source: https://raw.githubusercontent.com/saltstack/salt/master/pkg/osx/scripts/com.saltstack.salt.master.plist - source_hash: {{ salt_settings.salt_master_macos_plist_hash }} - - retry: - attempts: 2 - until: True - interval: 10 - splay: 10 + - retry: {{ salt_settings.retry_options | json }} - require_in: - service: salt-master {%- endif %} diff --git a/salt/minion.sls b/salt/minion.sls index 0963282..a672aaf 100644 --- a/salt/minion.sls +++ b/salt/minion.sls @@ -27,11 +27,7 @@ download-salt-minion: - test -n "{{ salt_settings.version }}" && '/opt/salt/bin/salt-minion --version=.*{{ salt_settings.version }}.*' - require_in: - macpackage: salt-minion - - retry: - attempts: 2 - until: True - interval: 10 - splay: 10 + - retry: {{ salt_settings.retry_options | json }} {%- elif "workaround https://github.com/saltstack/salt/issues/49348" %} cmd.run: - name: /usr/local/bin/brew install {{ salt_settings.salt_minion }} @@ -45,11 +41,7 @@ salt-minion-macos: - name: /Library/LaunchDaemons/com.saltstack.salt.minion.plist - source: https://raw.githubusercontent.com/saltstack/salt/master/pkg/osx/scripts/com.saltstack.salt.master.plist - source_hash: {{ salt_settings.salt_minion_macos_plist_hash }} - - retry: - attempts: 2 - until: True - interval: 10 - splay: 10 + - retry: {{ salt_settings.retry_options | json }} - require_in: - service: salt-minion - watch_in: diff --git a/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml b/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml index ba55dc8..331ddc4 100644 --- a/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml @@ -94,6 +94,11 @@ values: python_git: python-git release: '3000' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml b/test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml index f099f27..5660023 100644 --- a/test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml @@ -94,6 +94,11 @@ values: python_git: python-git release: '3000' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml index 21239a9..a3e84ea 100644 --- a/test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml @@ -94,6 +94,11 @@ values: python_git: GitPython release: '3000' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3000-py3/files/_mapdata/centos-7.yaml b/test/integration/v3000-py3/files/_mapdata/centos-7.yaml index 3ea4b2d..807aa83 100644 --- a/test/integration/v3000-py3/files/_mapdata/centos-7.yaml +++ b/test/integration/v3000-py3/files/_mapdata/centos-7.yaml @@ -94,6 +94,11 @@ values: python_git: GitPython release: '3000' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3000-py3/files/_mapdata/centos-8.yaml b/test/integration/v3000-py3/files/_mapdata/centos-8.yaml index 4e3e209..ece7d0e 100644 --- a/test/integration/v3000-py3/files/_mapdata/centos-8.yaml +++ b/test/integration/v3000-py3/files/_mapdata/centos-8.yaml @@ -94,6 +94,11 @@ values: python_git: GitPython release: '3000' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3000-py3/files/_mapdata/debian-10.yaml b/test/integration/v3000-py3/files/_mapdata/debian-10.yaml index e94449e..d0c1007 100644 --- a/test/integration/v3000-py3/files/_mapdata/debian-10.yaml +++ b/test/integration/v3000-py3/files/_mapdata/debian-10.yaml @@ -93,6 +93,11 @@ values: python_git: python-git release: '3000' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3000-py3/files/_mapdata/debian-9.yaml b/test/integration/v3000-py3/files/_mapdata/debian-9.yaml index 5b6a56f..2d810e8 100644 --- a/test/integration/v3000-py3/files/_mapdata/debian-9.yaml +++ b/test/integration/v3000-py3/files/_mapdata/debian-9.yaml @@ -93,6 +93,11 @@ values: python_git: python-git release: '3000' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3000-py3/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/v3000-py3/files/_mapdata/gentoo-2-sysd.yaml index 2e57c32..0f27eaa 100644 --- a/test/integration/v3000-py3/files/_mapdata/gentoo-2-sysd.yaml +++ b/test/integration/v3000-py3/files/_mapdata/gentoo-2-sysd.yaml @@ -91,6 +91,11 @@ values: python_git: python-git release: '3000' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: app-admin/salt diff --git a/test/integration/v3000-py3/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/v3000-py3/files/_mapdata/gentoo-2-sysv.yaml index 2e57c32..0f27eaa 100644 --- a/test/integration/v3000-py3/files/_mapdata/gentoo-2-sysv.yaml +++ b/test/integration/v3000-py3/files/_mapdata/gentoo-2-sysv.yaml @@ -91,6 +91,11 @@ values: python_git: python-git release: '3000' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: app-admin/salt diff --git a/test/integration/v3000-py3/files/_mapdata/opensuse-15.yaml b/test/integration/v3000-py3/files/_mapdata/opensuse-15.yaml index 9b1b79c..41aa635 100644 --- a/test/integration/v3000-py3/files/_mapdata/opensuse-15.yaml +++ b/test/integration/v3000-py3/files/_mapdata/opensuse-15.yaml @@ -94,6 +94,11 @@ values: python_git: python-git release: '3000' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml index 71c6a04..74a55ec 100644 --- a/test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml @@ -94,6 +94,11 @@ values: python_git: GitPython release: '3000' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3000-py3/files/_mapdata/oraclelinux-8.yaml b/test/integration/v3000-py3/files/_mapdata/oraclelinux-8.yaml index 29b8400..d5edf93 100644 --- a/test/integration/v3000-py3/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/v3000-py3/files/_mapdata/oraclelinux-8.yaml @@ -94,6 +94,11 @@ values: python_git: GitPython release: '3000' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml b/test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml index 09ce99c..398f0f5 100644 --- a/test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml @@ -94,6 +94,11 @@ values: python_git: python-git release: '3000' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml b/test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml index 08ed091..71289e7 100644 --- a/test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml @@ -94,6 +94,11 @@ values: python_git: python-git release: '3000' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3000-py3/files/_mapdata/windows-2019-server.yaml b/test/integration/v3000-py3/files/_mapdata/windows-2019-server.yaml index 4f3b4f3..f62d876 100644 --- a/test/integration/v3000-py3/files/_mapdata/windows-2019-server.yaml +++ b/test/integration/v3000-py3/files/_mapdata/windows-2019-server.yaml @@ -90,6 +90,11 @@ values: python_git: python-git release: '3000' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: kitchen salt_api: salt-api diff --git a/test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml index 7df717e..c80a024 100644 --- a/test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml @@ -94,6 +94,11 @@ values: python_git: GitPython release: '3001' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3001-py3/files/_mapdata/centos-7.yaml b/test/integration/v3001-py3/files/_mapdata/centos-7.yaml index 88806c0..961ca8b 100644 --- a/test/integration/v3001-py3/files/_mapdata/centos-7.yaml +++ b/test/integration/v3001-py3/files/_mapdata/centos-7.yaml @@ -94,6 +94,11 @@ values: python_git: GitPython release: '3001' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3001-py3/files/_mapdata/centos-8.yaml b/test/integration/v3001-py3/files/_mapdata/centos-8.yaml index 8d68a74..c99d3a0 100644 --- a/test/integration/v3001-py3/files/_mapdata/centos-8.yaml +++ b/test/integration/v3001-py3/files/_mapdata/centos-8.yaml @@ -94,6 +94,11 @@ values: python_git: GitPython release: '3001' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3001-py3/files/_mapdata/debian-10.yaml b/test/integration/v3001-py3/files/_mapdata/debian-10.yaml index fe4ecc5..6334d69 100644 --- a/test/integration/v3001-py3/files/_mapdata/debian-10.yaml +++ b/test/integration/v3001-py3/files/_mapdata/debian-10.yaml @@ -93,6 +93,11 @@ values: python_git: python-git release: '3001' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3001-py3/files/_mapdata/debian-9.yaml b/test/integration/v3001-py3/files/_mapdata/debian-9.yaml index 5f67a36..589601d 100644 --- a/test/integration/v3001-py3/files/_mapdata/debian-9.yaml +++ b/test/integration/v3001-py3/files/_mapdata/debian-9.yaml @@ -93,6 +93,11 @@ values: python_git: python-git release: '3001' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3001-py3/files/_mapdata/fedora-32.yaml b/test/integration/v3001-py3/files/_mapdata/fedora-32.yaml index be8c9f3..37a5882 100644 --- a/test/integration/v3001-py3/files/_mapdata/fedora-32.yaml +++ b/test/integration/v3001-py3/files/_mapdata/fedora-32.yaml @@ -94,6 +94,11 @@ values: python_git: GitPython release: '3001' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3001-py3/files/_mapdata/fedora-33.yaml b/test/integration/v3001-py3/files/_mapdata/fedora-33.yaml index 2a4690e..3ea0c28 100644 --- a/test/integration/v3001-py3/files/_mapdata/fedora-33.yaml +++ b/test/integration/v3001-py3/files/_mapdata/fedora-33.yaml @@ -94,6 +94,11 @@ values: python_git: GitPython release: '3001' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysd.yaml index 9e2168b..976c00c 100644 --- a/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysd.yaml +++ b/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysd.yaml @@ -91,6 +91,11 @@ values: python_git: python-git release: '3001' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: app-admin/salt diff --git a/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysv.yaml index 9e2168b..976c00c 100644 --- a/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysv.yaml +++ b/test/integration/v3001-py3/files/_mapdata/gentoo-2-sysv.yaml @@ -91,6 +91,11 @@ values: python_git: python-git release: '3001' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: app-admin/salt diff --git a/test/integration/v3001-py3/files/_mapdata/opensuse-15.yaml b/test/integration/v3001-py3/files/_mapdata/opensuse-15.yaml index cbcaf2b..09a52a2 100644 --- a/test/integration/v3001-py3/files/_mapdata/opensuse-15.yaml +++ b/test/integration/v3001-py3/files/_mapdata/opensuse-15.yaml @@ -94,6 +94,11 @@ values: python_git: python-git release: '3001' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3001-py3/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/v3001-py3/files/_mapdata/opensuse-tumbleweed.yaml index 73f7f5a..a6c8a6d 100644 --- a/test/integration/v3001-py3/files/_mapdata/opensuse-tumbleweed.yaml +++ b/test/integration/v3001-py3/files/_mapdata/opensuse-tumbleweed.yaml @@ -94,6 +94,11 @@ values: python_git: python-git release: '3001' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml index cb2d895..7ad70f6 100644 --- a/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml @@ -94,6 +94,11 @@ values: python_git: GitPython release: '3001' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml b/test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml index 1027a5c..ae7f877 100644 --- a/test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml @@ -94,6 +94,11 @@ values: python_git: GitPython release: '3001' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3001-py3/files/_mapdata/ubuntu-16.yaml b/test/integration/v3001-py3/files/_mapdata/ubuntu-16.yaml index 4959e5e..09739e1 100644 --- a/test/integration/v3001-py3/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/v3001-py3/files/_mapdata/ubuntu-16.yaml @@ -94,6 +94,11 @@ values: python_git: python-git release: '3001' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml b/test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml index 0f0b46b..0e4dbef 100644 --- a/test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml @@ -94,6 +94,11 @@ values: python_git: python-git release: '3001' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml b/test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml index 9f1a5d5..d3755d7 100644 --- a/test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml @@ -94,6 +94,11 @@ values: python_git: python-git release: '3001' restart_via_at: false + retry_options: + attempts: 2 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml b/test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml index 2451643..238322f 100644 --- a/test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml @@ -94,6 +94,11 @@ values: python_git: GitPython release: '3002' restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3002-py3/files/_mapdata/arch-base-latest.yaml b/test/integration/v3002-py3/files/_mapdata/arch-base-latest.yaml index feb3c4f..58cc040 100644 --- a/test/integration/v3002-py3/files/_mapdata/arch-base-latest.yaml +++ b/test/integration/v3002-py3/files/_mapdata/arch-base-latest.yaml @@ -93,6 +93,11 @@ values: python_git: python2-gitpython release: '3002' restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt diff --git a/test/integration/v3002-py3/files/_mapdata/centos-7.yaml b/test/integration/v3002-py3/files/_mapdata/centos-7.yaml index e181430..52fcc3b 100644 --- a/test/integration/v3002-py3/files/_mapdata/centos-7.yaml +++ b/test/integration/v3002-py3/files/_mapdata/centos-7.yaml @@ -94,6 +94,11 @@ values: python_git: GitPython release: '3002' restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3002-py3/files/_mapdata/centos-8.yaml b/test/integration/v3002-py3/files/_mapdata/centos-8.yaml index 93d8311..303d853 100644 --- a/test/integration/v3002-py3/files/_mapdata/centos-8.yaml +++ b/test/integration/v3002-py3/files/_mapdata/centos-8.yaml @@ -94,6 +94,11 @@ values: python_git: GitPython release: '3002' restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3002-py3/files/_mapdata/debian-10.yaml b/test/integration/v3002-py3/files/_mapdata/debian-10.yaml index cf4a608..7ab5075 100644 --- a/test/integration/v3002-py3/files/_mapdata/debian-10.yaml +++ b/test/integration/v3002-py3/files/_mapdata/debian-10.yaml @@ -93,6 +93,11 @@ values: python_git: python-git release: '3002' restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3002-py3/files/_mapdata/debian-9.yaml b/test/integration/v3002-py3/files/_mapdata/debian-9.yaml index 6681f68..1119a48 100644 --- a/test/integration/v3002-py3/files/_mapdata/debian-9.yaml +++ b/test/integration/v3002-py3/files/_mapdata/debian-9.yaml @@ -93,6 +93,11 @@ values: python_git: python-git release: '3002' restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3002-py3/files/_mapdata/fedora-32.yaml b/test/integration/v3002-py3/files/_mapdata/fedora-32.yaml index b713436..ac21406 100644 --- a/test/integration/v3002-py3/files/_mapdata/fedora-32.yaml +++ b/test/integration/v3002-py3/files/_mapdata/fedora-32.yaml @@ -94,6 +94,11 @@ values: python_git: GitPython release: '3002' restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3002-py3/files/_mapdata/fedora-33.yaml b/test/integration/v3002-py3/files/_mapdata/fedora-33.yaml index 3736f2f..3d83a17 100644 --- a/test/integration/v3002-py3/files/_mapdata/fedora-33.yaml +++ b/test/integration/v3002-py3/files/_mapdata/fedora-33.yaml @@ -94,6 +94,11 @@ values: python_git: GitPython release: '3002' restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysd.yaml index eff157d..6a3416d 100644 --- a/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysd.yaml +++ b/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysd.yaml @@ -91,6 +91,11 @@ values: python_git: python-git release: '3002' restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: app-admin/salt diff --git a/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysv.yaml index eff157d..6a3416d 100644 --- a/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysv.yaml +++ b/test/integration/v3002-py3/files/_mapdata/gentoo-2-sysv.yaml @@ -91,6 +91,11 @@ values: python_git: python-git release: '3002' restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: app-admin/salt diff --git a/test/integration/v3002-py3/files/_mapdata/opensuse-15.yaml b/test/integration/v3002-py3/files/_mapdata/opensuse-15.yaml index 1df95c7..72411fe 100644 --- a/test/integration/v3002-py3/files/_mapdata/opensuse-15.yaml +++ b/test/integration/v3002-py3/files/_mapdata/opensuse-15.yaml @@ -94,6 +94,11 @@ values: python_git: python-git release: '3002' restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3002-py3/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/v3002-py3/files/_mapdata/opensuse-tumbleweed.yaml index 244d7f2..387251b 100644 --- a/test/integration/v3002-py3/files/_mapdata/opensuse-tumbleweed.yaml +++ b/test/integration/v3002-py3/files/_mapdata/opensuse-tumbleweed.yaml @@ -94,6 +94,11 @@ values: python_git: python-git release: '3002' restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml b/test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml index d0407e2..0602866 100644 --- a/test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml @@ -94,6 +94,11 @@ values: python_git: GitPython release: '3002' restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml b/test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml index ea2572c..01f3949 100644 --- a/test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml @@ -94,6 +94,11 @@ values: python_git: GitPython release: '3002' restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3002-py3/files/_mapdata/ubuntu-16.yaml b/test/integration/v3002-py3/files/_mapdata/ubuntu-16.yaml index 8fca9f2..6d89c6f 100644 --- a/test/integration/v3002-py3/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/v3002-py3/files/_mapdata/ubuntu-16.yaml @@ -94,6 +94,11 @@ values: python_git: python-git release: '3002' restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml b/test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml index b9b2f8a..e6329eb 100644 --- a/test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml @@ -94,6 +94,11 @@ values: python_git: python-git release: '3002' restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml b/test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml index 3060276..e87d9ef 100644 --- a/test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml @@ -94,6 +94,11 @@ values: python_git: python-git release: '3002' restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: root salt_api: salt-api diff --git a/test/integration/v3002-py3/files/_mapdata/windows-2016-server.yaml b/test/integration/v3002-py3/files/_mapdata/windows-2016-server.yaml index dbd4c6a..a9396b9 100644 --- a/test/integration/v3002-py3/files/_mapdata/windows-2016-server.yaml +++ b/test/integration/v3002-py3/files/_mapdata/windows-2016-server.yaml @@ -90,6 +90,11 @@ values: python_git: python-git release: '3002' restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: kitchen salt_api: salt-api diff --git a/test/integration/v3002-py3/files/_mapdata/windows-2019-server.yaml b/test/integration/v3002-py3/files/_mapdata/windows-2019-server.yaml index 80ab0b9..df3a49a 100644 --- a/test/integration/v3002-py3/files/_mapdata/windows-2019-server.yaml +++ b/test/integration/v3002-py3/files/_mapdata/windows-2019-server.yaml @@ -90,6 +90,11 @@ values: python_git: python-git release: '3002' restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: kitchen salt_api: salt-api diff --git a/test/integration/v3002-py3/files/_mapdata/windows-8.yaml b/test/integration/v3002-py3/files/_mapdata/windows-8.yaml index 3fe2a3c..c2e81af 100644 --- a/test/integration/v3002-py3/files/_mapdata/windows-8.yaml +++ b/test/integration/v3002-py3/files/_mapdata/windows-8.yaml @@ -90,6 +90,11 @@ values: python_git: python-git release: '3002' restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true rootgroup: root rootuser: vagrant salt_api: salt-api