diff --git a/Jenkinsfile b/Jenkinsfile index 90af3524c5..cbf3c019b1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -333,6 +333,7 @@ pipeline { spec/reports/*.xml, spec/reports-audit/*.xml, gems/conjur-rack/spec/reports/*.xml, + gems/slosilo/spec/reports/*.xml, cucumber/*/features/reports/**/*.xml ''' ) @@ -893,10 +894,12 @@ pipeline { spec/reports/*.xml, spec/reports-audit/*.xml, gems/conjur-rack/spec/reports/*.xml, + gems/slosilo/spec/reports/*.xml cucumber/*/features/reports/**/*.xml, ee-test/spec/reports/*.xml, ee-test/spec/reports-audit/*.xml, ee-test/gems/conjur-rack/spec/reports/*.xml, + ee-test/gems/slosilo/spec/reports/*.xml, ee-test/cucumber/*/features/reports/**/*.xml ''' ) @@ -1091,6 +1094,11 @@ def conjurTests() { "Rack - ${env.STAGE_NAME}": { sh 'cd gems/conjur-rack && ./test.sh' } + ], + "slosilo": [ + "Slosilo - ${env.STAGE_NAME}": { + sh 'cd gems/slosilo && ./test.sh' + } ] ] } diff --git a/gems/slosilo/CHANGELOG.md b/gems/slosilo/CHANGELOG.md index d287dc93f5..1f9ffbe917 100644 --- a/gems/slosilo/CHANGELOG.md +++ b/gems/slosilo/CHANGELOG.md @@ -1,3 +1,6 @@ +**This Gem has been moved into Conjur. All Slosilo Changelog entries should +appear in the main Changelog.** + # v3.0.1 * The symmetric cipher class now encrypts and decrypts in a thread-safe manner.