From 7653b5dec4583320cc56f6035c1a8667e407a909 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Tue, 1 Oct 2019 21:38:37 +0100
Subject: [PATCH] ci(kitchen): use bootstrapped `opensuse` images until
`2019.2.2` [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/52
---
kitchen.yml | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/kitchen.yml b/kitchen.yml
index f7a6a02..abee0da 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -38,11 +38,13 @@ platforms:
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
- name: opensuse-leap-15-develop-py3
driver:
- image: netmanagers/salt-develop-py3:opensuse-leap-15
+ image: opensuse/leap:15
provision_command:
- - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
+ - systemctl enable sshd.service
run_command: /usr/lib/systemd/systemd
+ provisioner:
+ salt_bootstrap_options: -XdPfrq -x python3 git develop
+ salt_install: bootstrap
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
@@ -76,8 +78,13 @@ platforms:
image: netmanagers/salt-2019.2-py3:fedora-30
- name: opensuse-leap-15-2019-2-py3
driver:
- image: netmanagers/salt-2019.2-py3:opensuse-leap-15
+ image: opensuse/leap:15
+ provision_command:
+ - systemctl enable sshd.service
run_command: /usr/lib/systemd/systemd
+ provisioner:
+ salt_bootstrap_options: -XdPfrq -x python3 git 2019.2
+ salt_install: bootstrap
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
@@ -105,8 +112,13 @@ platforms:
image: netmanagers/salt-2018.3-py2:fedora-29
- name: opensuse-leap-15-2018-3-py2
driver:
- image: netmanagers/salt-2018.3-py2:opensuse-leap-15
+ image: opensuse/leap:15
+ provision_command:
+ - systemctl enable sshd.service
run_command: /usr/lib/systemd/systemd
+ provisioner:
+ salt_bootstrap_options: -XdPfrq -x python2 git 2018.3
+ salt_install: bootstrap
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
@@ -135,8 +147,13 @@ platforms:
image: netmanagers/salt-2017.7-py2:fedora-29
- name: opensuse-leap-15-2017-7-py2
driver:
- image: netmanagers/salt-2017.7-py2:opensuse-leap-15
+ image: opensuse/leap:15
+ provision_command:
+ - systemctl enable sshd.service
run_command: /usr/lib/systemd/systemd
+ provisioner:
+ salt_bootstrap_options: -XdPfrq -x python2 git 2017.7
+ salt_install: bootstrap
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport: