From e9cb3d27284d81115bac16c3af225c4b25eebaf9 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 3 Apr 2022 10:19:53 +0100 Subject: [PATCH] test(_mapdata): add/update verification files for Fedora & Gentoo --- .../default/files/_mapdata/fedora-34.yaml | 6 +- .../default/files/_mapdata/fedora-35.yaml | 117 ++++++++++++++++++ .../default/files/_mapdata/gentoo-2-sysd.yaml | 2 +- .../default/files/_mapdata/gentoo-2-sysv.yaml | 2 +- 4 files changed, 122 insertions(+), 5 deletions(-) create mode 100644 test/integration/default/files/_mapdata/fedora-35.yaml diff --git a/test/integration/default/files/_mapdata/fedora-34.yaml b/test/integration/default/files/_mapdata/fedora-34.yaml index cad618d..bf86114 100644 --- a/test/integration/default/files/_mapdata/fedora-34.yaml +++ b/test/integration/default/files/_mapdata/fedora-34.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 install_packages: true - key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004/SALTSTACK-GPG-KEY.pub master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -87,14 +87,14 @@ values: state: running parallel: true pin_version: false - pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003 + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004 pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_name: saltstack py_ver: py3 pygit2: python2-pygit2 python_dulwich: python-dulwich python_git: GitPython - release: '3003' + release: '3004' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/fedora-35.yaml b/test/integration/default/files/_mapdata/fedora-35.yaml new file mode 100644 index 0000000..13c0f81 --- /dev/null +++ b/test/integration/default/files/_mapdata/fedora-35.yaml @@ -0,0 +1,117 @@ +# yamllint disable rule:indentation rule:line-length +# Fedora-35 +--- +values: + formulas_settings: + checkout_orig_branch: false + git_opts: + default: + basedir: /srv/formulas + baseurl: https://github.com/saltstack-formulas + options: + output_loglevel: quiet + rev: master + update: false + list: {} + salt_settings: + api_service: salt-api + api_service_details: + enabled: true + state: running + clean_config_d_dir: true + cloud: + template_sources: + maps: salt://salt/files/cloud.maps.d + profiles: salt://salt/files/cloud.profiles.d + providers: salt://salt/files/cloud.providers.d + config_path: /etc/salt + gitfs: + dulwich: + install_from_source: true + gitpython: + install_from_source: false + pygit2: + git: + install_from_package: git + require_state: false + install_from_source: false + libgit2: + build_parent_dir: /usr/src/ + download_hash: 683d1164e361e2a0a8d52652840e2340 + install_from_source: true + version: 0.23.0 + version: 0.23.0 + install_packages: true + key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004/SALTSTACK-GPG-KEY.pub + master: + ext_pillar: + - cmd_yaml: cat /etc/salt/yaml + - stack: + - /path/to/stack1.cfg + - /path/to/stack2.cfg + - reclass: + inventory_base_uri: /etc/reclass + - saltclass: + - path: /srv/saltclass + file_roots: + base: + - /srv/salt + fileserver_backend: + - rootfs + gitfs_provider: pygit2 + pillar_roots: + base: + - /srv/pillar + master_config_use_TOFS: false + master_remove_config: false + master_service: salt-master + master_service_details: + enabled: true + state: running + minion: + file_roots: + base: + - /srv/salt + fileserver_backend: + - rootfs + master: localhost + master_type: str + pillar_roots: + base: + - /srv/pillar + minion_config_use_TOFS: false + minion_remove_config: false + minion_service: salt-minion + minion_service_details: + enabled: true + state: running + parallel: true + pin_version: false + pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004 + pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever + pkgrepo_name: saltstack + py_ver: py3 + pygit2: python2-pygit2 + python_dulwich: python-dulwich + python_git: GitPython + release: '3004' + restart_via_at: false + retry_options: + attempts: 5 + interval: 10 + splay: 10 + until: true + rootgroup: root + rootuser: root + salt_api: salt-api + salt_cloud: salt-cloud + salt_master: salt-master + salt_master_macos_plist_hash: '' + salt_minion: salt-minion + salt_minion_macos_plist_hash: '' + salt_ssh: salt-ssh + salt_syndic: salt-syndic + ssh_roster: {} + syndic_service: salt-syndic + use_pip: false + version: '' diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml index 5de1282..008272c 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml @@ -91,7 +91,7 @@ values: pyinotify: dev-python/pyinotify python_dulwich: python-dulwich python_git: python-git - release: '3003' + release: '3004' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml index 5de1282..008272c 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml @@ -91,7 +91,7 @@ values: pyinotify: dev-python/pyinotify python_dulwich: python-dulwich python_git: python-git - release: '3003' + release: '3004' restart_via_at: false retry_options: attempts: 5