Drop Travis CI support
- Fix test suites
- Update pillars
Fixes: PROD-25037 (PROD:25037)
Change-Id: I7928e7dbe57f3c032a781039a76108f3ad4d759e
diff --git a/.kitchen.yml b/.kitchen.yml
index bb3c6e9..b5b641b 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -28,25 +28,22 @@
name: inspec
sudo: true
+docker_images:
+ - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19'%>
+ - &xenial-stable <%=ENV['IMAGE_XENIAL_STABLE'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
platforms:
- - name: <%=ENV['PLATFORM'] || 'saltstack-ubuntu-xenial-salt-stable' %>
+ - name: xenial-2017.7
driver_config:
- image: <%=ENV['PLATFORM'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
+ image: *xenial-20177
+ platform: ubuntu
+
+ - name: xenial-stable
+ driver_config:
+ image: *xenial-stable
platform: ubuntu
suites:
-
- - name: openjdk-7
- provisioner:
- pillars-from-files:
- java.sls: tests/pillar/openjdk-7.sls
-
- - name: openjdk-8
- provisioner:
- pillars-from-files:
- java.sls: tests/pillar/openjdk-8.sls
-
- name: openjdk-9
provisioner:
pillars-from-files:
@@ -57,18 +54,8 @@
pillars-from-files:
java.sls: tests/pillar/openjdk-10.sls
- - name: oracle-jdk-8
+ - name: oracle-jdk-11
provisioner:
pillars-from-files:
- java.sls: tests/pillar/oracle-jdk-8.sls
-
- - name: oracle-jdk-9
- provisioner:
- pillars-from-files:
- java.sls: tests/pillar/oracle-jdk-9.sls
-
- - name: oracle-jdk-10
- provisioner:
- pillars-from-files:
- java.sls: tests/pillar/oracle-jdk-10.sls
+ java.sls: tests/pillar/oracle-jdk-11.sls
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
\ No newline at end of file