Skip to content

Commit

Permalink
update tests to run against bionic (#79)
Browse files Browse the repository at this point in the history
- fix storer to account for rsyslog changes in inputtcp
   - using new directives rather then old style seems to fix it
- update to running tests against bionic(current cf-d standard)
  • Loading branch information
Benjamin Fuller authored Jun 23, 2022
1 parent 23f3a34 commit 71f83ad
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 12 deletions.
27 changes: 17 additions & 10 deletions jobs/syslog_storer/templates/rsyslog.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,25 @@ $ModLoad imudp
$UDPServerRun <%= port %>
<% elsif transport == 'tcp' %>
# Listen for logs over TCP
$ModLoad imtcp
$InputTCPMaxSessions 500
<% if_p('syslog.tls.ca', 'syslog.tls.certificate', 'syslog.tls.ca') do %>
$DefaultNetstreamDriver gtls
$DefaultNetstreamDriverCAFile /var/vcap/jobs/syslog_storer/config/ca.pem
$DefaultNetstreamDriverCertFile /var/vcap/jobs/syslog_storer/config/syslog-storer.crt
$DefaultNetstreamDriverKeyFile /var/vcap/jobs/syslog_storer/config/syslog-storer.key
$InputTCPServerStreamDriverMode 1
$InputTCPServerStreamDriverAuthMode anon
global(
defaultNetstreamDriverCAFile="/var/vcap/jobs/syslog_storer/config/ca.pem"
defaultNetstreamDriverCertFile="/var/vcap/jobs/syslog_storer/config/syslog-storer.crt"
defaultNetstreamDriverKeyFile="/var/vcap/jobs/syslog_storer/config/syslog-storer.key"
defaultNetstreamDriver="gtls"
)

module(
load="imtcp"
StreamDriver.Name="gtls"
StreamDriver.Mode="1"
StreamDriver.AuthMode="anon"
)
<% end.else do %>
module(load="imtcp")
<% end %>
$InputTCPServerRun <%= port %>
input(type="imtcp" port="514")
<% else %>
<% raise 'only RELP, UDP, and TCP are supported' %>
<% end %>
Expand Down
1 change: 0 additions & 1 deletion scripts/test
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ pushd "$(dirname "$0")/.."
bosh upload-release
popd

bosh upload-stemcell https://bosh.io/d/stemcells/bosh-google-kvm-ubuntu-xenial-go_agent
pushd "$(dirname "$0")/../tests"
go install github.com/onsi/ginkgo/ginkgo@latest
ginkgo -r -nodes=2 "$@"
Expand Down
2 changes: 1 addition & 1 deletion tests/boshhelpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func StemcellOS() string {
if stemcellOS, stemcellEnvSet := os.LookupEnv("STEMCELL_OS"); stemcellEnvSet {
return stemcellOS
}
return "ubuntu-xenial"
return "ubuntu-bionic"
}

func BoshCmd(args ...string) *gexec.Session {
Expand Down

0 comments on commit 71f83ad

Please sign in to comment.