Skip to content

Commit 4419c79

Browse files
dafyddjdafyddj
committed
test(_mapdata): update to latest versions
1 parent f1e36d6 commit 4419c79

19 files changed

+1199
-41
lines changed

‎test/integration/default/files/_mapdata/almalinux-8.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ values:
4242
version: 0.23.0
4343
version: 0.23.0
4444
install_packages: true
45-
key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004/SALTSTACK-GPG-KEY.pub
45+
key_url: https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
4646
master:
4747
ext_pillar:
4848
- cmd_yaml: cat /etc/salt/yaml
@@ -87,14 +87,13 @@ values:
8787
state: running
8888
parallel: true
8989
pin_version: false
90-
pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004
91-
pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
92-
pkgrepo_name: saltstack
90+
pkgrepo: https://packages.broadcom.com/artifactory/saltproject-rpm/
91+
pkgrepo_humanname: Salt Repo for Salt LATEST release
92+
pkgrepo_name: salt-repo-latest
9393
py_ver: py3
9494
pygit2: python-pygit2
9595
python_dulwich: python-dulwich
9696
python_git: GitPython
97-
release: '3004'
9897
restart_via_at: false
9998
retry_options:
10099
attempts: 5

‎test/integration/default/files/_mapdata/almalinux-9.yaml

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
# yamllint disable rule:indentation rule:line-length
2+
# AlmaLinux-9
3+
---
4+
values:
5+
formulas_settings:
6+
checkout_orig_branch: false
7+
git_opts:
8+
default:
9+
basedir: /srv/formulas
10+
baseurl: https://github.com/saltstack-formulas
11+
options:
12+
output_loglevel: quiet
13+
rev: master
14+
update: false
15+
list: {}
16+
salt_settings:
17+
api_service: salt-api
18+
api_service_details:
19+
enabled: true
20+
state: running
21+
clean_config_d_dir: true
22+
cloud:
23+
template_sources:
24+
maps: salt://salt/files/cloud.maps.d
25+
profiles: salt://salt/files/cloud.profiles.d
26+
providers: salt://salt/files/cloud.providers.d
27+
config_path: /etc/salt
28+
gitfs:
29+
dulwich:
30+
install_from_source: true
31+
gitpython:
32+
install_from_source: false
33+
pygit2:
34+
git:
35+
install_from_package: git
36+
require_state: false
37+
install_from_source: false
38+
libgit2:
39+
build_parent_dir: /usr/src/
40+
download_hash: 683d1164e361e2a0a8d52652840e2340
41+
install_from_source: true
42+
version: 0.23.0
43+
version: 0.23.0
44+
install_packages: true
45+
key_url: https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
46+
master:
47+
ext_pillar:
48+
- cmd_yaml: cat /etc/salt/yaml
49+
- stack:
50+
- /path/to/stack1.cfg
51+
- /path/to/stack2.cfg
52+
- reclass:
53+
inventory_base_uri: /etc/reclass
54+
- saltclass:
55+
- path: /srv/saltclass
56+
file_roots:
57+
base:
58+
- /srv/salt
59+
fileserver_backend:
60+
- rootfs
61+
gitfs_provider: pygit2
62+
pillar_roots:
63+
base:
64+
- /srv/pillar
65+
master_config_use_TOFS: false
66+
master_remove_config: false
67+
master_service: salt-master
68+
master_service_details:
69+
enabled: true
70+
state: running
71+
minion:
72+
file_roots:
73+
base:
74+
- /srv/salt
75+
fileserver_backend:
76+
- rootfs
77+
master: localhost
78+
master_type: str
79+
pillar_roots:
80+
base:
81+
- /srv/pillar
82+
minion_config_use_TOFS: false
83+
minion_remove_config: false
84+
minion_service: salt-minion
85+
minion_service_details:
86+
enabled: true
87+
state: running
88+
parallel: true
89+
pin_version: false
90+
pkgrepo: https://packages.broadcom.com/artifactory/saltproject-rpm/
91+
pkgrepo_humanname: Salt Repo for Salt LATEST release
92+
pkgrepo_name: salt-repo-latest
93+
py_ver: py3
94+
pygit2: python-pygit2
95+
python_dulwich: python-dulwich
96+
python_git: GitPython
97+
restart_via_at: false
98+
retry_options:
99+
attempts: 5
100+
interval: 10
101+
splay: 10
102+
until: true
103+
rootgroup: root
104+
rootuser: root
105+
salt_api: salt-api
106+
salt_cloud: salt-cloud
107+
salt_master: salt-master
108+
salt_master_macos_plist_hash: ''
109+
salt_minion: salt-minion
110+
salt_minion_macos_plist_hash: ''
111+
salt_ssh: salt-ssh
112+
salt_syndic: salt-syndic
113+
ssh_roster: {}
114+
syndic_service: salt-syndic
115+
use_pip: false
116+
version: ''

‎test/integration/default/files/_mapdata/amazonlinux-2023.yaml

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
# yamllint disable rule:indentation rule:line-length
2+
# Amazon Linux-2023
3+
---
4+
values:
5+
formulas_settings:
6+
checkout_orig_branch: false
7+
git_opts:
8+
default:
9+
basedir: /srv/formulas
10+
baseurl: https://github.com/saltstack-formulas
11+
options:
12+
output_loglevel: quiet
13+
rev: master
14+
update: false
15+
list: {}
16+
salt_settings:
17+
api_service: salt-api
18+
api_service_details:
19+
enabled: true
20+
state: running
21+
clean_config_d_dir: true
22+
cloud:
23+
template_sources:
24+
maps: salt://salt/files/cloud.maps.d
25+
profiles: salt://salt/files/cloud.profiles.d
26+
providers: salt://salt/files/cloud.providers.d
27+
config_path: /etc/salt
28+
gitfs:
29+
dulwich:
30+
install_from_source: true
31+
gitpython:
32+
install_from_source: false
33+
pygit2:
34+
git:
35+
install_from_package: git
36+
require_state: false
37+
install_from_source: false
38+
libgit2:
39+
build_parent_dir: /usr/src/
40+
download_hash: 683d1164e361e2a0a8d52652840e2340
41+
install_from_source: true
42+
version: 0.23.0
43+
version: 0.23.0
44+
install_packages: true
45+
key_url: https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
46+
master:
47+
ext_pillar:
48+
- cmd_yaml: cat /etc/salt/yaml
49+
- stack:
50+
- /path/to/stack1.cfg
51+
- /path/to/stack2.cfg
52+
- reclass:
53+
inventory_base_uri: /etc/reclass
54+
- saltclass:
55+
- path: /srv/saltclass
56+
file_roots:
57+
base:
58+
- /srv/salt
59+
fileserver_backend:
60+
- rootfs
61+
gitfs_provider: pygit2
62+
pillar_roots:
63+
base:
64+
- /srv/pillar
65+
master_config_use_TOFS: false
66+
master_remove_config: false
67+
master_service: salt-master
68+
master_service_details:
69+
enabled: true
70+
state: running
71+
minion:
72+
file_roots:
73+
base:
74+
- /srv/salt
75+
fileserver_backend:
76+
- rootfs
77+
master: localhost
78+
master_type: str
79+
pillar_roots:
80+
base:
81+
- /srv/pillar
82+
minion_config_use_TOFS: false
83+
minion_remove_config: false
84+
minion_service: salt-minion
85+
minion_service_details:
86+
enabled: true
87+
state: running
88+
parallel: true
89+
pin_version: false
90+
pkgrepo: https://packages.broadcom.com/artifactory/saltproject-rpm/
91+
pkgrepo_humanname: SaltStack repo for Amazon Linux 2
92+
pkgrepo_name: saltstack-amzn-repo
93+
py_ver: py3
94+
pygit2: python-pygit2
95+
python_dulwich: python-dulwich
96+
python_git: GitPython
97+
restart_via_at: false
98+
retry_options:
99+
attempts: 5
100+
interval: 10
101+
splay: 10
102+
until: true
103+
rootgroup: root
104+
rootuser: root
105+
salt_api: salt-api
106+
salt_cloud: salt-cloud
107+
salt_master: salt-master
108+
salt_master_macos_plist_hash: ''
109+
salt_minion: salt-minion
110+
salt_minion_macos_plist_hash: ''
111+
salt_ssh: salt-ssh
112+
salt_syndic: salt-syndic
113+
ssh_roster: {}
114+
syndic_service: salt-syndic
115+
use_pip: false
116+
version: ''

‎test/integration/default/files/_mapdata/centos-8.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ values:
4242
version: 0.23.0
4343
version: 0.23.0
4444
install_packages: true
45-
key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004/SALTSTACK-GPG-KEY.pub
45+
key_url: https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
4646
master:
4747
ext_pillar:
4848
- cmd_yaml: cat /etc/salt/yaml
@@ -87,14 +87,13 @@ values:
8787
state: running
8888
parallel: true
8989
pin_version: false
90-
pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004
91-
pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
92-
pkgrepo_name: saltstack
90+
pkgrepo: https://packages.broadcom.com/artifactory/saltproject-rpm/
91+
pkgrepo_humanname: Salt Repo for Salt LATEST release
92+
pkgrepo_name: salt-repo-latest
9393
py_ver: py3
9494
pygit2: python-pygit2
9595
python_dulwich: python-dulwich
9696
python_git: GitPython
97-
release: '3004'
9897
restart_via_at: false
9998
retry_options:
10099
attempts: 5

0 commit comments

Comments
 (0)