Skip to content

brats: fix upgrade from postgres 13 test #2804

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkocher merged 2 commits into from
Aug 14, 2026
Merged

brats: fix upgrade from postgres 13 test #2804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e097006
brats: run syslog-forwarder under bpm
mkocher Aug 13, 2026
58b4a04
brats: fix upgrade from postgres 13 test
mkocher Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/shared/brats/test-acceptance.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ params:
# one fails loudly instead of quietly testing another line's stemcell.
DIRECTOR_STEMCELL_OS:
STEMCELL_OS:
START_INNER_BOSH_TIMEOUT: "" # default is 25m
START_INNER_BOSH_TIMEOUT: "" # default is 30m
9 changes: 6 additions & 3 deletions src/brats/acceptance/blobstore_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ var _ = Describe("Blobstore", func() {
fmt.Sprintf("-v agent_blobstore_endpoint=%s://%s:25250", schema, utils.InnerDirectorIP()),
)

utils.UploadRelease("https://bosh.io/d/github.com/cloudfoundry/syslog-release?v=11")
utils.UploadRelease("https://bosh.io/d/github.com/cloudfoundry/syslog-release?v=12.3.27")
utils.UploadRelease("https://bosh.io/d/github.com/cloudfoundry/bpm-release?v=1.4.36")
utils.UploadStemcell(candidateWardenLinuxStemcellPath)

session := utils.Bosh("-n", "deploy", utils.AssetPath("syslog-manifest.yml"),
Expand Down Expand Up @@ -112,7 +113,8 @@ var _ = Describe("Blobstore", func() {
fmt.Sprintf("-o %s", utils.BoshDeploymentAssetPath("enable-signed-urls.yml")),
fmt.Sprintf("-o %s", utils.AssetPath("ops-enable-signed-urls-cpi.yml")),
)
utils.UploadRelease("https://bosh.io/d/github.com/cloudfoundry/syslog-release?v=11")
utils.UploadRelease("https://bosh.io/d/github.com/cloudfoundry/syslog-release?v=12.3.27")
utils.UploadRelease("https://bosh.io/d/github.com/cloudfoundry/bpm-release?v=1.4.36")
utils.UploadStemcell(candidateWardenLinuxStemcellPath)

By("compiling (by deploying)")
Expand Down Expand Up @@ -153,7 +155,8 @@ var _ = Describe("Blobstore", func() {
utils.StartInnerBosh(
fmt.Sprintf("-o %s", utils.BoshDeploymentAssetPath("enable-signed-urls.yml")),
)
utils.UploadRelease("https://bosh.io/d/github.com/cloudfoundry/syslog-release?v=11")
utils.UploadRelease("https://bosh.io/d/github.com/cloudfoundry/syslog-release?v=12.3.27")
utils.UploadRelease("https://bosh.io/d/github.com/cloudfoundry/bpm-release?v=1.4.36")
utils.UploadStemcell(candidateWardenLinuxStemcellPath)

By("compiling (by deploying)")
Expand Down
8 changes: 4 additions & 4 deletions src/brats/assets/postgres-13-manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ instance_groups:
azs: [z1]
instances: 1
jobs:
- name: postgres
- name: postgres-13
release: bosh
- name: bpm
release: bpm
Expand All @@ -27,9 +27,9 @@ stemcells:

releases:
- name: "bosh"
version: "276.1.1"
url: "https://bosh.io/d/github.com/cloudfoundry/bosh?v=276.1.1"
sha1: "f9a625dd8a8fc6e01f1641390ced3ac0fee31523"
version: "283.1.4"
url: "https://bosh.io/d/github.com/cloudfoundry/bosh?v=283.1.4"
sha1: "sha256:90ff361c730572b5beb275555f0f536c7d739ce94c946616e49bffc895cc3dc8"
- name: bpm
version: latest

Expand Down
6 changes: 6 additions & 0 deletions src/brats/assets/syslog-manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ name: syslog-deployment
releases:
- name: syslog
version: latest
- name: bpm
version: latest

stemcells:
- alias: default
Expand Down Expand Up @@ -39,7 +41,11 @@ instance_groups:
networks:
- {name: default}
jobs:
- name: bpm
release: bpm
- name: syslog_forwarder
release: syslog
consumes:
syslog_storer: { from: syslog_storer }
properties:
use_bpm: true
2 changes: 1 addition & 1 deletion src/brats/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func Bootstrap() {
AssertEnvExists("BOSH_ENVIRONMENT")
AssertEnvExists("BOSH_DEPLOYMENT_PATH")

startInnerBoshTimeoutString := LoadEnvOrDefault("START_INNER_BOSH_TIMEOUT", "25m")
startInnerBoshTimeoutString := LoadEnvOrDefault("START_INNER_BOSH_TIMEOUT", "30m")
var err error
startInnerBoshTimeout, err = time.ParseDuration(startInnerBoshTimeoutString)
Expect(err).NotTo(HaveOccurred())
Expand Down
Loading