Skip to content
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
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: 2 additions & 0 deletions ci/input/inputs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ opsReleases:
repository: cloudfoundry-incubator/backup-and-restore-sdk-release
- name: cflinuxfs4-compat
repository: cloudfoundry/cflinuxfs4-compat-release
- name: cflinuxfs5
repository: cloudfoundry/cflinuxfs5-release
- name: haproxy
repository: cloudfoundry-incubator/haproxy-boshrelease
varsFiles: "environments/test/pre-dev/haproxy-vars.yml"
Expand Down
40 changes: 39 additions & 1 deletion ci/pipelines/cf-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ groups:
- experimental-deploy
- experimental-smoke-tests
- experimental-cats
- experimental-cats-cflinuxfs5
- experimental-delete-deployment
- lite-acquire-pool
- lite-deploy
Expand Down Expand Up @@ -80,6 +81,7 @@ groups:
- lint-cf-deployment-manifest
- experimental-acquire-pool
- experimental-cats
- experimental-cats-cflinuxfs5
- experimental-deploy
- experimental-delete-deployment
- experimental-release-pool-manual
Expand Down Expand Up @@ -1111,7 +1113,7 @@ jobs:
params: {release: experimental-pool}

- name: experimental-deploy
serial_groups: [ experimental-cats, experimental-smokes ]
serial_groups: [ experimental-cats, experimental-cats-cflinuxfs5, experimental-smokes ]
public: true
plan:
- get: experimental-pool
Expand Down Expand Up @@ -1168,6 +1170,7 @@ jobs:
operations/experimental/enable-containerd-for-processes.yml
operations/experimental/disable-cf-credhub.yml
operations/experimental/disable-interpolate-service-bindings.yml
operations/experimental/add-cflinuxfs5.yml
operations/increase-doppler-vm-type-from-minimal-to-small.yml
operations/scale-diego-cell-to-8.yml
operations/test/speed-up-dynamic-asgs.yml
Expand Down Expand Up @@ -1224,6 +1227,7 @@ jobs:
operations/experimental/disable-cf-credhub.yml
operations/experimental/disable-interpolate-service-bindings.yml
operations/experimental/use-mysql-version-8.4.yml
operations/experimental/add-cflinuxfs5.yml
operations/increase-doppler-vm-type-from-minimal-to-small.yml
operations/scale-diego-cell-to-8.yml
operations/test/speed-up-dynamic-asgs.yml
Expand Down Expand Up @@ -1332,6 +1336,39 @@ jobs:
RELINT_VERBOSE_AUTH: "true"
SKIP_REGEXP: "shows logs and metrics"

- name: experimental-cats-cflinuxfs5
serial_groups: [ experimental-cats-cflinuxfs5 ]
public: true
plan:
- timeout: 4h
do:
- get: experimental-pool
trigger: true
passed: [ experimental-deploy ]
- in_parallel:
- get: cf-acceptance-tests-rc
- get: relint-envs
- get: cf-deployment-develop
passed: [ experimental-deploy ]
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This job should run after "experimental-cats". Otherwise, two CATs suites will run in parallel and might overload the deployment.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Made it experimental-cats-cflinuxfs5 to start after the regular CATs job finishes.

- get: cf-deployment-concourse-tasks
- task: update-integration-configs
file: cf-deployment-concourse-tasks/update-integration-configs/task.yml
params:
BBL_STATE_DIR: environments/test/hermione/bbl-state
CATS_INTEGRATION_CONFIG_FILE: environments/test/hermione/cflinuxfs5_integration_config.json
input_mapping:
bbl-state: relint-envs
integration-configs: relint-envs
- task: run-cats
input_mapping:
integration-config: updated-integration-configs
cf-acceptance-tests: cf-acceptance-tests-rc
file: cf-deployment-concourse-tasks/run-cats/task.yml
params:
CONFIG_FILE_PATH: environments/test/hermione/cflinuxfs5_integration_config.json
REPORTER_CONFIG_FILE_PATH: environments/test/hermione/reporter_config.json
RELINT_VERBOSE_AUTH: "true"

- name: experimental-delete-deployment
serial: true
public: true
Expand All @@ -1340,6 +1377,7 @@ jobs:
trigger: true
passed:
- experimental-cats
- experimental-cats-cflinuxfs5
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new job "experimental-cats-cflinuxfs5" will likely be red for some time. So the downstream delete job wouldn't be executed and the VMs wouldn't be cleaned up. Not sure how we solved this last time. One solution would be to execute the delete step in a Concourse "ensure" block: https://concourse-ci.org/docs/steps/modifier-and-hooks/ensure/

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed experimental-cats-cflinuxfs5 from the passed constraint (so delete triggers after experimental-cats and experimental-smoke-tests pass), and added serial_groups: [ experimental-cats-cflinuxfs5 ] to both jobs. This way, I think Concourse will wait for any in-progress cflinuxfs5 run to finish before starting cleanup, without blocking cleanup entirely if cflinuxfs5 is permanently red.

- experimental-smoke-tests
- in_parallel:
- get: cf-deployment-concourse-tasks
Expand Down