Merge pull request #462 from myii/chore/standardise-structure-146

ci(kitchen+travis): adjust matrix to update `3000` to `3000.1`

.travis.yml

@@ -58,13 +58,13 @@ jobs:
     ## Define the rest of the matrix based on Kitchen testing
     # Make sure the instances listed below match up with
     # the `platforms` defined in `kitchen.yml`
-    - env: INSTANCE=v3000-py3-debian-10-3000-py3
+    - env: INSTANCE=v3000-py3-debian-10-3000-1-py3
-    - env: INSTANCE=v3000-py3-ubuntu-1804-3000-py3
+    - env: INSTANCE=v3000-py3-ubuntu-1804-3000-1-py3
-    - env: INSTANCE=v3000-py3-centos-8-3000-py3
+    - env: INSTANCE=v3000-py3-centos-8-3000-1-py3
-    - env: INSTANCE=v3000-py3-fedora-31-3000-py3
+    - env: INSTANCE=v3000-py3-fedora-31-3000-1-py3
-    # - env: INSTANCE=v3000-py3-opensuse-leap-151-3000-py3
+    # - env: INSTANCE=v3000-py3-opensuse-leap-151-3000-1-py3
-    - env: INSTANCE=v3000-py3-amazonlinux-2-3000-py3
+    - env: INSTANCE=v3000-py3-amazonlinux-2-3000-1-py3
-    # - env: INSTANCE=v3000-py2-arch-base-latest-3000-py2
+    # - env: INSTANCE=v3000-py2-arch-base-latest-3000-1-py2
     # - env: INSTANCE=v201902-py3-debian-10-2019-2-py3
     - env: INSTANCE=v201902-py3-debian-9-2019-2-py3
     # - env: INSTANCE=v201902-py3-ubuntu-1804-2019-2-py3

kitchen.yml

@@ -11,33 +11,33 @@ driver:
 # Make sure the platforms listed below match up with
 # the `env.matrix` instances defined in `.travis.yml`
 platforms:
-  ## SALT `3000`
+  ## SALT `3000.1`
-  - name: debian-10-3000-py3
+  - name: debian-10-3000-1-py3
     driver:
-      image: netmanagers/salt-3000-py3:debian-10
+      image: netmanagers/salt-3000.1-py3:debian-10
-  - name: ubuntu-1804-3000-py3
+  - name: ubuntu-1804-3000-1-py3
     driver:
-      image: netmanagers/salt-3000-py3:ubuntu-18.04
+      image: netmanagers/salt-3000.1-py3:ubuntu-18.04
-  - name: centos-8-3000-py3
+  - name: centos-8-3000-1-py3
     driver:
-      image: netmanagers/salt-3000-py3:centos-8
+      image: netmanagers/salt-3000.1-py3:centos-8
-  - name: fedora-31-3000-py3
+  - name: fedora-31-3000-1-py3
     driver:
-      image: netmanagers/salt-3000-py3:fedora-31
+      image: netmanagers/salt-3000.1-py3:fedora-31
-  - name: opensuse-leap-151-3000-py3
+  - name: opensuse-leap-151-3000-1-py3
     driver:
-      image: netmanagers/salt-3000-py3:opensuse-leap-15.1
+      image: netmanagers/salt-3000.1-py3:opensuse-leap-15.1
       run_command: /usr/lib/systemd/systemd
     # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: amazonlinux-2-3000-py3
+  - name: amazonlinux-2-3000-1-py3
     driver:
-      image: netmanagers/salt-3000-py3:amazonlinux-2
+      image: netmanagers/salt-3000.1-py3:amazonlinux-2
-  - name: arch-base-latest-3000-py2
+  - name: arch-base-latest-3000-1-py2
     driver:
-      image: netmanagers/salt-3000-py2:arch-base-latest
+      image: netmanagers/salt-3000.1-py2:arch-base-latest
       run_command: /usr/lib/systemd/systemd
 
   ## SALT `2019.2`
@@ -118,12 +118,12 @@ verifier:
 suites:
   - name: v3000-py3
     includes:
-      - debian-10-3000-py3
+      - debian-10-3000-1-py3
-      - ubuntu-1804-3000-py3
+      - ubuntu-1804-3000-1-py3
-      - centos-8-3000-py3
+      - centos-8-3000-1-py3
-      - fedora-31-3000-py3
+      - fedora-31-3000-1-py3
-      - opensuse-leap-151-3000-py3
+      - opensuse-leap-151-3000-1-py3
-      - amazonlinux-2-3000-py3
+      - amazonlinux-2-3000-1-py3
     provisioner:
       state_top:
         base:
@@ -145,7 +145,7 @@ suites:
         - path: test/integration/v3000-py3
   - name: v3000-py2
     includes:
-      - arch-base-latest-3000-py2
+      - arch-base-latest-3000-1-py2
     provisioner:
       state_top:
         base:

test/integration/v201803-py2/controls/service_spec.rb

@@ -8,6 +8,7 @@ control 'salt services' do
     salt-minion
   ].each do |p|
     describe service(p) do
+      it { should be_installed }
       it { should be_enabled }
       it { should be_running }
     end

test/integration/v201902-py2/controls/service_spec.rb

@@ -8,6 +8,7 @@ control 'salt services' do
     salt-minion
   ].each do |p|
     describe service(p) do
+      it { should be_installed }
       it { should be_enabled }
       it { should be_running }
     end

test/integration/v201902-py3/controls/service_spec.rb

@@ -8,6 +8,7 @@ control 'salt services' do
     salt-minion
   ].each do |p|
     describe service(p) do
+      it { should be_installed }
       it { should be_enabled }
       it { should be_running }
     end

test/integration/v3000-py3/controls/pkgs_spec.rb

@@ -5,16 +5,16 @@ version =
   when 'redhat'
     case platform[:name]
     when 'amazon'
-      '3000-1.amzn2'
+      '3000.1-1.amzn2'
     when 'centos'
-      '3000-1.el8'
+      '3000.1-1.el8'
     end
   when 'fedora'
     '3000-5.fc31'
   when 'suse'
     '3000-lp151.28.1'
   when 'debian'
-    '3000+ds-1'
+    '3000.1+ds-1'
   end
 
 control 'salt packages' do

test/integration/v3000-py3/controls/service_spec.rb

@@ -8,6 +8,7 @@ control 'salt services' do
     salt-minion
   ].each do |p|
     describe service(p) do
+      it { should be_installed }
       it { should be_enabled }
       it { should be_running }
     end