Skip to content

Commit c090077

Browse files
committed
ci(kitchen): use bootstrapped opensuse images until 2019.2.2
* Automated using myii/ssf-formula#52
1 parent 59ff68c commit c090077

File tree

1 file changed

+23
-6
lines changed

1 file changed

+23
-6
lines changed

kitchen.yml

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,13 @@ platforms:
4747
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
4848
- name: opensuse-leap-15-develop-py3
4949
driver:
50-
image: netmanagers/salt-develop-py3:opensuse-leap-15
50+
image: opensuse/leap:15
5151
provision_command:
52-
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
53-
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
52+
- systemctl enable sshd.service
5453
run_command: /usr/lib/systemd/systemd
54+
provisioner:
55+
salt_bootstrap_options: -XdPfrq -x python3 git develop
56+
salt_install: bootstrap
5557
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
5658
# => SCP did not finish successfully (255): (Net::SCP::Error)
5759
transport:
@@ -85,8 +87,13 @@ platforms:
8587
image: netmanagers/salt-2019.2-py3:fedora-30
8688
- name: opensuse-leap-15-2019-2-py3
8789
driver:
88-
image: netmanagers/salt-2019.2-py3:opensuse-leap-15
90+
image: opensuse/leap:15
91+
provision_command:
92+
- systemctl enable sshd.service
8993
run_command: /usr/lib/systemd/systemd
94+
provisioner:
95+
salt_bootstrap_options: -XdPfrq -x python3 git 2019.2
96+
salt_install: bootstrap
9097
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
9198
# => SCP did not finish successfully (255): (Net::SCP::Error)
9299
transport:
@@ -114,8 +121,13 @@ platforms:
114121
image: netmanagers/salt-2018.3-py2:fedora-29
115122
- name: opensuse-leap-15-2018-3-py2
116123
driver:
117-
image: netmanagers/salt-2018.3-py2:opensuse-leap-15
124+
image: opensuse/leap:15
125+
provision_command:
126+
- systemctl enable sshd.service
118127
run_command: /usr/lib/systemd/systemd
128+
provisioner:
129+
salt_bootstrap_options: -XdPfrq -x python2 git 2018.3
130+
salt_install: bootstrap
119131
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
120132
# => SCP did not finish successfully (255): (Net::SCP::Error)
121133
transport:
@@ -144,8 +156,13 @@ platforms:
144156
image: netmanagers/salt-2017.7-py2:fedora-29
145157
- name: opensuse-leap-15-2017-7-py2
146158
driver:
147-
image: netmanagers/salt-2017.7-py2:opensuse-leap-15
159+
image: opensuse/leap:15
160+
provision_command:
161+
- systemctl enable sshd.service
148162
run_command: /usr/lib/systemd/systemd
163+
provisioner:
164+
salt_bootstrap_options: -XdPfrq -x python2 git 2017.7
165+
salt_install: bootstrap
149166
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
150167
# => SCP did not finish successfully (255): (Net::SCP::Error)
151168
transport:

0 commit comments

Comments
 (0)