Skip to content

Commit a39e124

Browse files
committed
ci(kitchen): use bootstrapped opensuse images until 2019.2.2 [skip ci]
* Automated using myii/ssf-formula#52
1 parent b335ee5 commit a39e124

File tree

1 file changed

+23
-6
lines changed

1 file changed

+23
-6
lines changed

Diff for: kitchen.yml

+23-6
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,13 @@ platforms:
3838
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
3939
- name: opensuse-leap-15-develop-py3
4040
driver:
41-
image: netmanagers/salt-develop-py3:opensuse-leap-15
41+
image: opensuse/leap:15
4242
provision_command:
43-
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
44-
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
43+
- systemctl enable sshd.service
4544
run_command: /usr/lib/systemd/systemd
45+
provisioner:
46+
salt_bootstrap_options: -XdPfrq -x python3 git develop
47+
salt_install: bootstrap
4648
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
4749
# => SCP did not finish successfully (255): (Net::SCP::Error)
4850
transport:
@@ -76,8 +78,13 @@ platforms:
7678
image: netmanagers/salt-2019.2-py3:fedora-30
7779
- name: opensuse-leap-15-2019-2-py3
7880
driver:
79-
image: netmanagers/salt-2019.2-py3:opensuse-leap-15
81+
image: opensuse/leap:15
82+
provision_command:
83+
- systemctl enable sshd.service
8084
run_command: /usr/lib/systemd/systemd
85+
provisioner:
86+
salt_bootstrap_options: -XdPfrq -x python3 git 2019.2
87+
salt_install: bootstrap
8188
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
8289
# => SCP did not finish successfully (255): (Net::SCP::Error)
8390
transport:
@@ -105,8 +112,13 @@ platforms:
105112
image: netmanagers/salt-2018.3-py2:fedora-29
106113
- name: opensuse-leap-15-2018-3-py2
107114
driver:
108-
image: netmanagers/salt-2018.3-py2:opensuse-leap-15
115+
image: opensuse/leap:15
116+
provision_command:
117+
- systemctl enable sshd.service
109118
run_command: /usr/lib/systemd/systemd
119+
provisioner:
120+
salt_bootstrap_options: -XdPfrq -x python2 git 2018.3
121+
salt_install: bootstrap
110122
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
111123
# => SCP did not finish successfully (255): (Net::SCP::Error)
112124
transport:
@@ -135,8 +147,13 @@ platforms:
135147
image: netmanagers/salt-2017.7-py2:fedora-29
136148
- name: opensuse-leap-15-2017-7-py2
137149
driver:
138-
image: netmanagers/salt-2017.7-py2:opensuse-leap-15
150+
image: opensuse/leap:15
151+
provision_command:
152+
- systemctl enable sshd.service
139153
run_command: /usr/lib/systemd/systemd
154+
provisioner:
155+
salt_bootstrap_options: -XdPfrq -x python2 git 2017.7
156+
salt_install: bootstrap
140157
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
141158
# => SCP did not finish successfully (255): (Net::SCP::Error)
142159
transport:

0 commit comments

Comments
 (0)