From a8fe65a2c80a63cb167ea6f7f88b1198b6e07b97 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 1 Apr 2020 22:41:04 +0100 Subject: [PATCH 1/3] ci(kitchen+travis): adjust matrix to update `3000` to `3000.1` * Automated using https://github.com/myii/ssf-formula/pull/146 --- .travis.yml | 14 +++++++------- kitchen.yml | 44 ++++++++++++++++++++++---------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7071db7..56fb832 100644 --- a/.travis.yml +++ b/.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-ubuntu-1804-3000-py3 - - env: INSTANCE=v3000-py3-centos-8-3000-py3 - - env: INSTANCE=v3000-py3-fedora-31-3000-py3 - # - env: INSTANCE=v3000-py3-opensuse-leap-151-3000-py3 - - env: INSTANCE=v3000-py3-amazonlinux-2-3000-py3 - # - env: INSTANCE=v3000-py2-arch-base-latest-3000-py2 + - env: INSTANCE=v3000-py3-debian-10-3000-1-py3 + - env: INSTANCE=v3000-py3-ubuntu-1804-3000-1-py3 + - env: INSTANCE=v3000-py3-centos-8-3000-1-py3 + - env: INSTANCE=v3000-py3-fedora-31-3000-1-py3 + # - env: INSTANCE=v3000-py3-opensuse-leap-151-3000-1-py3 + - env: INSTANCE=v3000-py3-amazonlinux-2-3000-1-py3 + # - 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 diff --git a/kitchen.yml b/kitchen.yml index 7cf0df0..1e7335b 100644 --- a/kitchen.yml +++ b/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` - - name: debian-10-3000-py3 + ## SALT `3000.1` + - name: debian-10-3000-1-py3 driver: - image: netmanagers/salt-3000-py3:debian-10 - - name: ubuntu-1804-3000-py3 + image: netmanagers/salt-3000.1-py3:debian-10 + - name: ubuntu-1804-3000-1-py3 driver: - image: netmanagers/salt-3000-py3:ubuntu-18.04 - - name: centos-8-3000-py3 + image: netmanagers/salt-3000.1-py3:ubuntu-18.04 + - name: centos-8-3000-1-py3 driver: - image: netmanagers/salt-3000-py3:centos-8 - - name: fedora-31-3000-py3 + image: netmanagers/salt-3000.1-py3:centos-8 + - name: fedora-31-3000-1-py3 driver: - image: netmanagers/salt-3000-py3:fedora-31 - - name: opensuse-leap-151-3000-py3 + image: netmanagers/salt-3000.1-py3:fedora-31 + - 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 - - name: arch-base-latest-3000-py2 + image: netmanagers/salt-3000.1-py3:amazonlinux-2 + - 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 - - ubuntu-1804-3000-py3 - - centos-8-3000-py3 - - fedora-31-3000-py3 - - opensuse-leap-151-3000-py3 - - amazonlinux-2-3000-py3 + - debian-10-3000-1-py3 + - ubuntu-1804-3000-1-py3 + - centos-8-3000-1-py3 + - fedora-31-3000-1-py3 + - opensuse-leap-151-3000-1-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: From 1e677cd761ab82ff6160d7b96ce7f6920b2e02e4 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 1 Apr 2020 22:57:25 +0100 Subject: [PATCH 2/3] test(pkgs_spec): update `3000` to `3000.1` --- test/integration/v3000-py3/controls/pkgs_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/integration/v3000-py3/controls/pkgs_spec.rb b/test/integration/v3000-py3/controls/pkgs_spec.rb index 7f95373..3c3e45d 100644 --- a/test/integration/v3000-py3/controls/pkgs_spec.rb +++ b/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 From b5461a0ebab63fb77186ea5960e71bd1426609a1 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 1 Apr 2020 23:22:05 +0100 Subject: [PATCH 3/3] test(service_spec): add `should be_installed` --- test/integration/v201803-py2/controls/service_spec.rb | 1 + test/integration/v201902-py2/controls/service_spec.rb | 1 + test/integration/v201902-py3/controls/service_spec.rb | 1 + test/integration/v3000-py3/controls/service_spec.rb | 1 + 4 files changed, 4 insertions(+) diff --git a/test/integration/v201803-py2/controls/service_spec.rb b/test/integration/v201803-py2/controls/service_spec.rb index 27f8ae5..9d99883 100644 --- a/test/integration/v201803-py2/controls/service_spec.rb +++ b/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 diff --git a/test/integration/v201902-py2/controls/service_spec.rb b/test/integration/v201902-py2/controls/service_spec.rb index 27f8ae5..9d99883 100644 --- a/test/integration/v201902-py2/controls/service_spec.rb +++ b/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 diff --git a/test/integration/v201902-py3/controls/service_spec.rb b/test/integration/v201902-py3/controls/service_spec.rb index 27f8ae5..9d99883 100644 --- a/test/integration/v201902-py3/controls/service_spec.rb +++ b/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 diff --git a/test/integration/v3000-py3/controls/service_spec.rb b/test/integration/v3000-py3/controls/service_spec.rb index 27f8ae5..9d99883 100644 --- a/test/integration/v3000-py3/controls/service_spec.rb +++ b/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