From 273ea0310f69e7946ec4eddef87759bd0e98b03b Mon Sep 17 00:00:00 2001 From: Christopher Weibel Date: Mon, 6 May 2024 15:03:35 -0400 Subject: [PATCH 1/3] Switching to release concourse resource --- bosh/opsfiles/releases.yml | 14 +++++++------- ci/pipeline.yml | 12 +++++++++++- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/bosh/opsfiles/releases.yml b/bosh/opsfiles/releases.yml index 82a4315..d3ac8f0 100644 --- a/bosh/opsfiles/releases.yml +++ b/bosh/opsfiles/releases.yml @@ -1,10 +1,10 @@ -- path: /releases/name=app-autoscaler? - type: replace - value: - name: app-autoscaler - version: "12.2.2" - url: "https://bosh.io/d/github.com/cloudfoundry-incubator/app-autoscaler-release?v=12.2.2" - sha1: "a1fffce71219318d1fb27ec5fc3ff84e757337ed" +#- path: /releases/name=app-autoscaler? +# type: replace +# value: +# name: app-autoscaler +# version: "12.2.2" +# url: "https://bosh.io/d/github.com/cloudfoundry-incubator/app-autoscaler-release?v=12.2.2" +# sha1: "a1fffce71219318d1fb27ec5fc3ff84e757337ed" # Not used - type: remove diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 796ba05..61b03c7 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -14,6 +14,8 @@ jobs: plan: - in_parallel: - get: app-autoscaler-release + - get: release + trigger: true - get: autoscaler-manifests resource: autoscaler-manifests trigger: true @@ -28,6 +30,8 @@ jobs: - put: autoscaler-deployment-development params: &deploy-params manifest: app-autoscaler-release/templates/app-autoscaler.yml + releases: + - release/app-autoscaler-v*.tgz stemcells: - cf-stemcell-jammy/*.tgz ops_files: @@ -662,11 +666,17 @@ resources: type: git source: uri: https://github.com/cloud-gov/cg-deploy-autoscaler.git - branch: main + branch: cw5 #main paths: - ci/* - bosh/* +- name: release + type: github-release + source: + owner: cloudfoundry + repository: app-autoscaler-release + #- name: autoscaler-manifests-test # type: git From ca8146af02d4a42d73f577b44a6ee2a6c54a9212 Mon Sep 17 00:00:00 2001 From: Christopher Weibel Date: Mon, 6 May 2024 15:50:49 -0400 Subject: [PATCH 2/3] Switch to fully using concourse release resource --- ci/pipeline.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 61b03c7..1a9b28a 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -273,6 +273,9 @@ jobs: - get: app-autoscaler-release passed: [deploy-as-development] trigger: true + - get: release + passed: [deploy-as-development] + trigger: true - get: autoscaler-manifests resource: autoscaler-manifests passed: [acceptance-tests-api-development, acceptance-tests-broker-development ] @@ -288,6 +291,8 @@ jobs: - put: autoscaler-deployment-staging params: manifest: app-autoscaler-release/templates/app-autoscaler.yml + releases: + - release/app-autoscaler-v*.tgz stemcells: - cf-stemcell-jammy/*.tgz ops_files: @@ -466,6 +471,9 @@ jobs: - get: app-autoscaler-release passed: [deploy-as-staging] trigger: true + - get: release + passed: [deploy-as-staging] + trigger: true - get: autoscaler-manifests resource: autoscaler-manifests passed: [acceptance-tests-api-staging, acceptance-tests-broker-staging] @@ -481,6 +489,8 @@ jobs: - put: autoscaler-deployment-production params: manifest: app-autoscaler-release/templates/app-autoscaler.yml + releases: + - release/app-autoscaler-v*.tgz stemcells: - cf-stemcell-jammy/*.tgz ops_files: @@ -655,23 +665,23 @@ jobs: # Resources resources: -- name: app-autoscaler-release +- name: app-autoscaler-release #Used as input for folder structure for upstream ops files type: git source: uri: https://github.com/cloudfoundry/app-autoscaler-release branch: main tag_filter: "v*" -- name: autoscaler-manifests +- name: autoscaler-manifests #Used as input for folder structure for custom ops files type: git source: uri: https://github.com/cloud-gov/cg-deploy-autoscaler.git - branch: cw5 #main + branch: main paths: - ci/* - bosh/* -- name: release +- name: release #Used to detect when new bosh releases are cut type: github-release source: owner: cloudfoundry From f87c8853d07ae828aee7b708faa49b0797b2a529 Mon Sep 17 00:00:00 2001 From: Christopher Weibel Date: Mon, 6 May 2024 15:53:10 -0400 Subject: [PATCH 3/3] Remove hard coded release version, url, sha1 --- bosh/opsfiles/releases.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/bosh/opsfiles/releases.yml b/bosh/opsfiles/releases.yml index d3ac8f0..eb014bb 100644 --- a/bosh/opsfiles/releases.yml +++ b/bosh/opsfiles/releases.yml @@ -1,11 +1,3 @@ -#- path: /releases/name=app-autoscaler? -# type: replace -# value: -# name: app-autoscaler -# version: "12.2.2" -# url: "https://bosh.io/d/github.com/cloudfoundry-incubator/app-autoscaler-release?v=12.2.2" -# sha1: "a1fffce71219318d1fb27ec5fc3ff84e757337ed" - # Not used - type: remove path: /releases/name=postgres \ No newline at end of file