From d5789729b9ce764871020513da8bf9b8d6f7c707 Mon Sep 17 00:00:00 2001 From: i759715 Date: Mon, 11 May 2026 17:48:39 +0300 Subject: [PATCH 1/3] Add cflinuxfs5 stack to experimental pipeline validation --- ci/input/inputs.yml | 2 ++ ci/pipelines/cf-deployment.yml | 40 +++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/ci/input/inputs.yml b/ci/input/inputs.yml index 31e09b0ef..fd48fa75a 100644 --- a/ci/input/inputs.yml +++ b/ci/input/inputs.yml @@ -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" diff --git a/ci/pipelines/cf-deployment.yml b/ci/pipelines/cf-deployment.yml index 05c28f4be..80606522e 100644 --- a/ci/pipelines/cf-deployment.yml +++ b/ci/pipelines/cf-deployment.yml @@ -22,6 +22,7 @@ groups: - experimental-deploy - experimental-smoke-tests - experimental-cats + - experimental-cats-cflinuxfs5 - experimental-delete-deployment - lite-acquire-pool - lite-deploy @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 ] + - 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 @@ -1340,6 +1377,7 @@ jobs: trigger: true passed: - experimental-cats + - experimental-cats-cflinuxfs5 - experimental-smoke-tests - in_parallel: - get: cf-deployment-concourse-tasks From ab26640901c44957d5e9f6ebcd7722593e6cb217 Mon Sep 17 00:00:00 2001 From: Milena-Encheva <106135092+Milena-Encheva@users.noreply.github.com> Date: Wed, 13 May 2026 17:44:09 +0300 Subject: [PATCH 2/3] Update inputs.yml --- ci/input/inputs.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/ci/input/inputs.yml b/ci/input/inputs.yml index fd48fa75a..31e09b0ef 100644 --- a/ci/input/inputs.yml +++ b/ci/input/inputs.yml @@ -69,8 +69,6 @@ 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" From 1626e0f502eb5ab511de8de443404a1caaa78d13 Mon Sep 17 00:00:00 2001 From: i759715 Date: Thu, 14 May 2026 15:51:08 +0300 Subject: [PATCH 3/3] Run experimental-cats-cflinuxfs5 after experimental-cats. Ensure experimental-delete-deployment triggers cleanup even if experimental-cats-cflinuxfs5 fails --- ci/pipelines/cf-deployment.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/pipelines/cf-deployment.yml b/ci/pipelines/cf-deployment.yml index 80606522e..bb59e4808 100644 --- a/ci/pipelines/cf-deployment.yml +++ b/ci/pipelines/cf-deployment.yml @@ -1344,12 +1344,12 @@ jobs: do: - get: experimental-pool trigger: true - passed: [ experimental-deploy ] + passed: [ experimental-cats ] - in_parallel: - get: cf-acceptance-tests-rc - get: relint-envs - get: cf-deployment-develop - passed: [ experimental-deploy ] + passed: [ experimental-cats ] - get: cf-deployment-concourse-tasks - task: update-integration-configs file: cf-deployment-concourse-tasks/update-integration-configs/task.yml @@ -1371,13 +1371,13 @@ jobs: - name: experimental-delete-deployment serial: true + serial_groups: [ experimental-cats-cflinuxfs5 ] public: true plan: - get: experimental-pool trigger: true passed: - experimental-cats - - experimental-cats-cflinuxfs5 - experimental-smoke-tests - in_parallel: - get: cf-deployment-concourse-tasks