From 6154cb3f49b4cfe83cb6a986908adc1ac4662834 Mon Sep 17 00:00:00 2001 From: Aram Price Date: Tue, 17 Dec 2024 10:44:23 -0800 Subject: [PATCH] Switch away from concourse/bosh-cli image Just use bosh/integration! Also, delete the create-rc task/script as they were not used. Co-authored-by: Chris Selzo --- ci/bump-local-version.yml | 2 +- ci/create-rc.yml | 17 ----------------- ci/pipelines/bpm.yml | 2 ++ ci/scripts/create-rc | 17 ----------------- 4 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 ci/create-rc.yml delete mode 100755 ci/scripts/create-rc diff --git a/ci/bump-local-version.yml b/ci/bump-local-version.yml index 34fa0c72..6abd0fe4 100644 --- a/ci/bump-local-version.yml +++ b/ci/bump-local-version.yml @@ -4,7 +4,7 @@ platform: linux image_resource: type: registry-image source: - repository: concourse/bosh-cli + repository: bosh/integration inputs: - name: bpm-release diff --git a/ci/create-rc.yml b/ci/create-rc.yml deleted file mode 100644 index 1cb3a078..00000000 --- a/ci/create-rc.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -platform: linux - -image_resource: - type: registry-image - source: - repository: concourse/bosh-cli - -inputs: -- name: bpm-release -- name: version - -outputs: -- name: bpm-rc - -run: - path: bpm-release/ci/scripts/create-rc diff --git a/ci/pipelines/bpm.yml b/ci/pipelines/bpm.yml index a58e3ec5..ff41554e 100644 --- a/ci/pipelines/bpm.yml +++ b/ci/pipelines/bpm.yml @@ -345,6 +345,7 @@ jobs: - get: golang-release - task: bump-local-version file: bpm-release/ci/bump-local-version.yml + image: bosh-integration-image - task: finalize-release file: bosh-shared-ci/tasks/release/create-final-release.yml image: bosh-integration-image @@ -376,6 +377,7 @@ jobs: commitish: bpm-release/.git/ref generate_release_notes: true - task: bump-local-version + image: bosh-integration-image file: bpm-release/ci/bump-local-version.yml input_mapping: bpm-release: release_repo diff --git a/ci/scripts/create-rc b/ci/scripts/create-rc deleted file mode 100755 index 9bcefd48..00000000 --- a/ci/scripts/create-rc +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -set -e - -VERSION="$(cat version/version)" -RELEASE_TGZ="${PWD}/bpm-rc/bpm-${VERSION}.tgz" - -pushd bpm-release/ - # work-around Go BOSH CLI trying to rename blobs downloaded into ~/.root/tmp - # into release dir, which is invalid cross-device link - export HOME=$PWD - - bosh -n create-release \ - --name bpm \ - --version "$VERSION" \ - --tarball $RELEASE_TGZ -popd