From de2094fb2b127d08b6e8832cf202809e97cbfe10 Mon Sep 17 00:00:00 2001 From: Matthew Kocher Date: Wed, 24 Jun 2026 16:39:26 -0700 Subject: [PATCH 1/2] ci: upload bpm-release in smoke tests it's now a dependency of syslog-release --- acceptance-tests/ipv4director/smoke/smoke_suite_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/acceptance-tests/ipv4director/smoke/smoke_suite_test.go b/acceptance-tests/ipv4director/smoke/smoke_suite_test.go index beb52552c0..fdfeb77bca 100644 --- a/acceptance-tests/ipv4director/smoke/smoke_suite_test.go +++ b/acceptance-tests/ipv4director/smoke/smoke_suite_test.go @@ -22,10 +22,12 @@ var _ = BeforeSuite(func() { bosh = testhelpers.NewBOSH() stemcellPath := testhelpers.RequireEnv("STEMCELL_PATH") syslogReleasePath := testhelpers.RequireEnv("SYSLOG_RELEASE_PATH") + bpmReleasePath := testhelpers.RequireEnv("BPM_RELEASE_PATH") osConfReleasePath := testhelpers.RequireEnv("OS_CONF_RELEASE_PATH") bosh.UploadStemcell(stemcellPath) bosh.UploadRelease(syslogReleasePath) + bosh.UploadRelease(bpmReleasePath) bosh.UploadRelease(osConfReleasePath) bosh.SafeDeploy() }) From 878566cd27ab6f8e43396a05294125a23cea199f Mon Sep 17 00:00:00 2001 From: Matthew Kocher Date: Wed, 24 Jun 2026 16:50:36 -0700 Subject: [PATCH 2/2] ci: build dev release of syslog-release from source This is required until syslog-release cuts a new version which uses bpm instead of chpst. Once that happens this commit should be reverted. --- ci/pipeline-template.yml | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/ci/pipeline-template.yml b/ci/pipeline-template.yml index c90b0b9eb9..acf62f8ac7 100644 --- a/ci/pipeline-template.yml +++ b/ci/pipeline-template.yml @@ -508,8 +508,10 @@ jobs: - get: bosh-integration-registry-image - get: bosh-linux-stemcell-builder - get: bosh-deployment - - get: syslog-release - get: bpm-release + - get: syslog-release-src + params: + submodules: all - get: os-conf-release - get: stemcell passed: @@ -526,6 +528,22 @@ jobs: #@ end trigger: true - do: + - task: build-syslog-dev-release + image: bosh-integration-registry-image + config: + platform: linux + inputs: + - name: syslog-release-src + outputs: + - name: syslog-release + run: + path: /bin/bash + args: + - -c + - | + set -eu -o pipefail + cd syslog-release-src + bosh create-release --force --tarball ../syslog-release/syslog-dev-release.tgz - task: deploy-director file: bosh-stemcells-ci/ci/tasks/gcp/deploy-director.yml image: bosh-integration-registry-image @@ -577,8 +595,10 @@ jobs: - get: bosh-integration-registry-image - get: bosh-linux-stemcell-builder - get: bosh-deployment - - get: syslog-release - get: bpm-release + - get: syslog-release-src + params: + submodules: all - get: os-conf-release - get: stemcell passed: @@ -1787,10 +1807,11 @@ resources: source: repository: cloudfoundry/bosh -- name: syslog-release - type: bosh-io-release +- name: syslog-release-src + type: git source: - repository: cloudfoundry/syslog-release + uri: https://github.com/cloudfoundry/syslog-release + branch: main - name: os-conf-release type: bosh-io-release