From 6f63db1a64dc57c1c2024f4a6d2709a44220a427 Mon Sep 17 00:00:00 2001 From: Jochen Ehret Date: Mon, 8 Apr 2024 13:00:59 +0200 Subject: [PATCH] remove dev branch references --- ci/input/inputs.yml | 1 + ci/pipelines/update-releases.yml | 33 +++++++++--------------------- ci/template/update-releases.yml | 35 +++++++++----------------------- 3 files changed, 21 insertions(+), 48 deletions(-) diff --git a/ci/input/inputs.yml b/ci/input/inputs.yml index 300d5675c..e8bf642df 100644 --- a/ci/input/inputs.yml +++ b/ci/input/inputs.yml @@ -131,6 +131,7 @@ untestedOpsReleases: windowsStemcells: - name: windows2019 + stack: windows2019 opsFile: windows2019-cell.yml opsFileDir: operations diff --git a/ci/pipelines/update-releases.yml b/ci/pipelines/update-releases.yml index a4a40457d..b8634afe7 100644 --- a/ci/pipelines/update-releases.yml +++ b/ci/pipelines/update-releases.yml @@ -178,13 +178,6 @@ resources: branch: main uri: git@github.com:cloudfoundry/cf-deployment.git private_key: ((ard_wg_gitbot_ssh_key.private_key)) -- name: cf-deployment-fips - type: git - icon: github - source: - branch: integrate_fips_validation - uri: git@github.com:cloudfoundry/cf-deployment.git - private_key: ((ard_wg_gitbot_ssh_key.private_key)) - name: cf-deployment-version type: semver source: @@ -223,12 +216,6 @@ resources: icon: github source: uri: https://github.com/cloudfoundry/runtime-ci.git -- name: runtime-ci-fips-branch - type: git - icon: github - source: - uri: https://github.com/cloudfoundry/runtime-ci.git - branch: refactor_update_stemcell_task - name: stemcell type: bosh-io-stemcell icon: dna @@ -14047,13 +14034,14 @@ jobs: params: tarball: false - task: update-windows-stemcell-ops - file: runtime-ci/tasks/update-windows-stemcell-ops/task.yml + file: runtime-ci/tasks/update-stemcell-ops/task.yml input_mapping: ops-files: cf-deployment-develop - windows-stemcell: windows2019-stemcell + stemcell: windows2019-stemcell params: - ORIGINAL_WINDOWS_OPS_FILE_PATH: operations/windows2019-cell.yml - UPDATED_WINDOWS_OPS_FILE_PATH: operations/windows2019-cell.yml + STEMCELL_STACK: windows2019 + ORIGINAL_OPS_FILE_PATH: operations/windows2019-cell.yml + UPDATED_OPS_FILE_PATH: operations/windows2019-cell.yml - put: cf-deployment-develop params: rebase: true @@ -14063,23 +14051,22 @@ jobs: serial: true plan: - in_parallel: - - get: runtime-ci-fips-branch - - get: cf-deployment-fips + - get: runtime-ci + - get: cf-deployment-develop - get: fips-stemcell trigger: true params: tarball: false - task: update-stemcell-ops - file: runtime-ci-fips-branch/tasks/update-stemcell-ops/task.yml + file: runtime-ci/tasks/update-stemcell-ops/task.yml input_mapping: - runtime-ci: runtime-ci-fips-branch - ops-files: cf-deployment-fips + ops-files: cf-deployment-develop stemcell: fips-stemcell params: STEMCELL_STACK: ubuntu-jammy ORIGINAL_OPS_FILE_PATH: operations/fips-stemcell.yml UPDATED_OPS_FILE_PATH: operations/fips-stemcell.yml - - put: cf-deployment-fips + - put: cf-deployment-develop params: rebase: true repository: updated-stemcell-ops-file diff --git a/ci/template/update-releases.yml b/ci/template/update-releases.yml index 05e07c590..d7eb6b662 100644 --- a/ci/template/update-releases.yml +++ b/ci/template/update-releases.yml @@ -144,14 +144,6 @@ resources: uri: git@github.com:cloudfoundry/cf-deployment.git private_key: ((ard_wg_gitbot_ssh_key.private_key)) -- name: cf-deployment-fips - type: git - icon: github - source: - branch: integrate_fips_validation - uri: git@github.com:cloudfoundry/cf-deployment.git - private_key: ((ard_wg_gitbot_ssh_key.private_key)) - - name: cf-deployment-version type: semver source: @@ -196,13 +188,6 @@ resources: source: uri: https://github.com/cloudfoundry/runtime-ci.git -- name: runtime-ci-fips-branch - type: git - icon: github - source: - uri: https://github.com/cloudfoundry/runtime-ci.git - branch: refactor_update_stemcell_task - - name: stemcell type: bosh-io-stemcell icon: dna @@ -748,13 +733,14 @@ jobs: params: tarball: false - task: update-windows-stemcell-ops - file: runtime-ci/tasks/update-windows-stemcell-ops/task.yml + file: runtime-ci/tasks/update-stemcell-ops/task.yml input_mapping: ops-files: cf-deployment-develop - windows-stemcell: #@ s.name + "-stemcell" + stemcell: #@ s.name + "-stemcell" params: - ORIGINAL_WINDOWS_OPS_FILE_PATH: #@ "{}/{}".format(s.opsFileDir, s.opsFile) - UPDATED_WINDOWS_OPS_FILE_PATH: #@ "{}/{}".format(s.opsFileDir, s.opsFile) + STEMCELL_STACK: #@ s.stack + ORIGINAL_OPS_FILE_PATH: #@ "{}/{}".format(s.opsFileDir, s.opsFile) + UPDATED_OPS_FILE_PATH: #@ "{}/{}".format(s.opsFileDir, s.opsFile) - put: cf-deployment-develop params: rebase: true @@ -766,23 +752,22 @@ jobs: serial: true plan: - in_parallel: - - get: runtime-ci-fips-branch - - get: cf-deployment-fips + - get: runtime-ci + - get: cf-deployment-develop - get: fips-stemcell trigger: true params: tarball: false - task: update-stemcell-ops - file: runtime-ci-fips-branch/tasks/update-stemcell-ops/task.yml + file: runtime-ci/tasks/update-stemcell-ops/task.yml input_mapping: - runtime-ci: runtime-ci-fips-branch - ops-files: cf-deployment-fips + ops-files: cf-deployment-develop stemcell: fips-stemcell params: STEMCELL_STACK: ubuntu-jammy ORIGINAL_OPS_FILE_PATH: operations/fips-stemcell.yml UPDATED_OPS_FILE_PATH: operations/fips-stemcell.yml - - put: cf-deployment-fips + - put: cf-deployment-develop params: rebase: true repository: updated-stemcell-ops-file