Skip to content

Commit

Permalink
(SIMP-8075) Update Dependencies (#70)
Browse files Browse the repository at this point in the history
* (SIMP-7974) Fix `when: never` rule regex

The patch corrects the regex operator in the `.gitlab-ci.yml` YAML anchor
`&skip_job_when_commit_message_says_to`.  The previous pipeline had a bug
which _always_ skipped spec and acceptance tests (added at the last minute
when it was rearranged into semantic anchors, ironically to support `when:
never`)

CI: SKIP MATRIX
SIMP-8038 #close
SIMP-7974 #comment Fix when: never regex in .gitlab-ci.yml
SIMP-7975 #comment Fix when: never regex in .gitlab-ci.yml

[SIMP-7974]: https://simp-project.atlassian.net/browse/SIMP-7974
[SIMP-7975]: https://simp-project.atlassian.net/browse/SIMP-7975

* (SIMP-8075) Update Dependencies
- updated the upperbound of vox_selinux to < 4.0.0
- review showed no need for code changes
- update fixtures for iptables changes

SIMP-8075 #comment update rsync

* Add iptables precise matching to the test

Once we added a third host, we ran into the iptables bug that resulted
in the creation of the `iptables::precise_match` option (off by
default). Adding that to these tests, uncovered another bug so this will
need simp/pupmod-simp-iptables#84 to go through prior to the tests
working properly.

* Remove testing retries

* Update .gitlab-ci.yml

Co-authored-by: Chris Tessmer <chris.tessmer@onyxpoint.com>
Co-authored-by: Trevor Vaughan <tvaughan@onyxpoint.com>
  • Loading branch information
3 people authored Aug 19, 2020
1 parent b79cd52 commit 08bfdc4
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 6 deletions.
1 change: 1 addition & 0 deletions .fixtures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ fixtures:
selinux_core: https://github.com/puppetlabs/puppetlabs-selinux_core
simp_firewalld: https://github.com/simp/pupmod-simp-simp_firewalld
simp_options: https://github.com/simp/pupmod-simp-simp_options
simp_firewalld: https://github.com/simp/pupmod-simp-simp_firewalld
simplib: https://github.com/simp/pupmod-simp-simplib
simpcat: https://github.com/simp/pupmod-simp-simpcat
stdlib: https://github.com/simp/puppetlabs-stdlib
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* Wed Jul 29 2020 Jeanne Greulich <jeanne.greulich@onyxpoint.com> - 6.4.1-0
- Update upper bound for vox_selinux to < 4.0.0

* Fri Jan 10 2020 Liz Nemsick <lnemsick.simp@gmail.com> - 6.4.0-0
- Add EL8 support
- Update the upper bound of simp-simplib to < 5.0.0
Expand Down
4 changes: 2 additions & 2 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simp-rsync",
"version": "6.4.0",
"version": "6.4.1",
"author": "SIMP Team",
"summary": "manage an rsync server, secured by stunnel",
"license": "Apache-2.0",
Expand Down Expand Up @@ -35,7 +35,7 @@
},
{
"name": "simp/vox_selinux",
"version_requirement": ">= 1.5.2 < 2.0.0"
"version_requirement": ">= 1.5.2 < 4.0.0"
}
],
"operatingsystem_support": [
Expand Down
5 changes: 3 additions & 2 deletions spec/acceptance/suites/default/00_default_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@
}

let(:hieradata) {{
'simp_options::pki' => false,
'rsync::server::stunnel' => false
'iptables::precise_match' => true,
'simp_options::pki' => false,
'rsync::server::stunnel' => false
}}

hosts.each do |host|
Expand Down
3 changes: 2 additions & 1 deletion spec/acceptance/suites/default/10_server_client_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
}

let(:hieradata_server1) {{
'iptables::precise_match' => true,
'simp_options::pki' => false,
'simp_options::firewall' => true,
'rsync::server::stunnel' => false,
Expand All @@ -89,6 +90,7 @@
}}

let(:hieradata_server2) {{
'iptables::precise_match' => true,
'simp_options::pki' => false,
'simp_options::firewall' => true,
'rsync::server::stunnel' => false,
Expand Down Expand Up @@ -125,7 +127,6 @@
end
end
end

end

context 'test a file retrieval' do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
}

let(:hieradata_server1) {{
'iptables::precise_match' => true,
'simp_options::pki' => true,
'simp_options::pki::source' => '/etc/pki/simp-testing/pki',
'simp_options::firewall' => true,
Expand All @@ -135,11 +136,12 @@
}}

let(:hieradata_server2) {{
'iptables::precise_match' => true,
'simp_options::pki' => true,
'simp_options::pki::source' => '/etc/pki/simp-testing/pki',
'simp_options::firewall' => true,
'rsync::server::stunnel' => true,
'rsync::server::global::port' => 8873,
'rsync::server::global::port' => 8873,
'rsync::server::trusted_nets' => [server1_ip],
}}

Expand Down

0 comments on commit 08bfdc4

Please sign in to comment.