Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate fips validation #1172

Merged
merged 8 commits into from
Apr 29, 2024
Merged
1 change: 1 addition & 0 deletions ci/input/inputs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ untestedOpsReleases:

windowsStemcells:
- name: windows2019
stack: windows2019
opsFile: windows2019-cell.yml
opsFileDir: operations

Expand Down
49 changes: 45 additions & 4 deletions ci/pipelines/update-releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ groups:
jobs:
- update-windows2019-stemcell
- update-windows2019fs-offline-release
- name: update-fips-stemcell
jobs:
- update-fips-stemcell
- name: debug
jobs: []
- name: cleanup
Expand All @@ -143,6 +146,11 @@ resource_types:
source:
repository: cfcommunity/slack-notification-resource
tag: latest
- name: bosh-io-stemcell
source:
repository: foundationalinfrastructure/bosh-io-stemcell-resource
tag: v1.2.1
type: docker-image
resources:
- name: cf-deployment-all-branches
type: git
Expand Down Expand Up @@ -213,6 +221,14 @@ resources:
icon: dna
source:
name: bosh-google-kvm-ubuntu-jammy-go_agent
- name: fips-stemcell
type: bosh-io-stemcell
icon: dna
source:
name: bosh-aws-xen-hvm-ubuntu-jammy-fips-go_agent
auth:
access_key: ((ci_dev_gcp_service_account_hmac_access_key))
secret_key: ((ci_dev_gcp_service_account_hmac_secret))
- name: stemcell-version-bump-detect
type: stemcell-version-bump
icon: dna
Expand Down Expand Up @@ -14067,13 +14083,38 @@ 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
stemcell: windows2019-stemcell
params:
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
repository: updated-stemcell-ops-file
- name: update-fips-stemcell
public: true
serial: true
plan:
- in_parallel:
- get: runtime-ci
- get: cf-deployment-develop
- get: fips-stemcell
trigger: true
params:
tarball: false
- task: update-stemcell-ops
file: runtime-ci/tasks/update-stemcell-ops/task.yml
input_mapping:
ops-files: cf-deployment-develop
windows-stemcell: windows2019-stemcell
stemcell: fips-stemcell
params:
ORIGINAL_WINDOWS_OPS_FILE_PATH: operations/windows2019-cell.yml
UPDATED_WINDOWS_OPS_FILE_PATH: operations/windows2019-cell.yml
STEMCELL_STACK: ubuntu-jammy
ORIGINAL_OPS_FILE_PATH: operations/test/fips-stemcell.yml
UPDATED_OPS_FILE_PATH: operations/test/fips-stemcell.yml
- put: cf-deployment-develop
params:
rebase: true
Expand Down
53 changes: 49 additions & 4 deletions ci/template/update-releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ groups:
#@ for r in data.values.windowsOfflineReleases:
- #@ "update-" + r.name + "-offline-release"
#@ end
- name: update-fips-stemcell
jobs:
- update-fips-stemcell
- name: debug
jobs:
#@ for r in data.values.baseReleases:
Expand Down Expand Up @@ -103,6 +106,13 @@ resource_types:
repository: cfcommunity/slack-notification-resource
tag: latest

#! TODO remove this resource type declaration when a final release of the resource is available
- name: bosh-io-stemcell
source:
repository: foundationalinfrastructure/bosh-io-stemcell-resource
tag: v1.2.1
type: docker-image

resources:
- name: cf-deployment-all-branches
type: git
Expand Down Expand Up @@ -184,6 +194,15 @@ resources:
source:
name: bosh-google-kvm-ubuntu-jammy-go_agent

- name: fips-stemcell
type: bosh-io-stemcell
icon: dna
source:
name: bosh-aws-xen-hvm-ubuntu-jammy-fips-go_agent
auth:
access_key: ((ci_dev_gcp_service_account_hmac_access_key))
secret_key: ((ci_dev_gcp_service_account_hmac_secret))

- name: stemcell-version-bump-detect
type: stemcell-version-bump
icon: dna
Expand Down Expand Up @@ -716,19 +735,45 @@ 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
repository: updated-stemcell-ops-file
#@ end

- name: update-fips-stemcell
public: true
serial: true
plan:
- in_parallel:
- get: runtime-ci
- get: cf-deployment-develop
- get: fips-stemcell
trigger: true
params:
tarball: false
- task: update-stemcell-ops
file: runtime-ci/tasks/update-stemcell-ops/task.yml
input_mapping:
ops-files: cf-deployment-develop
stemcell: fips-stemcell
params:
STEMCELL_STACK: ubuntu-jammy
ORIGINAL_OPS_FILE_PATH: operations/test/fips-stemcell.yml
UPDATED_OPS_FILE_PATH: operations/test/fips-stemcell.yml
- put: cf-deployment-develop
params:
rebase: true
repository: updated-stemcell-ops-file

- name: detect-stemcell-bump
plan:
- in_parallel:
Expand Down
1 change: 1 addition & 0 deletions operations/test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ They may change without notice.
| [`enable-nfs-test-server.yml`](enable-nfs-test-server.yml) | adds an NFS server to the deployment | nfstestserver can be reached at nfstestserver.service.cf.internal for acceptance testing purposes |
| [`enable-nfs-test-ldapserver.yml`](enable-nfs-test-ldapserver.yml) | Adds an LDAP server to the deployment to allow testing of NFS volume services configured with LDAP authentication | Requires enable-nfs-volume-service.yml and enable-nfs-test-server.yml. nfstestldapserver can be reached at nfstestldapserver.service.cf.internal |
| [`enable-smb-test-server.yml`](enable-smb-test-server.yml) | adds an SMB server to the deployment | smbtestserver can be reached at smbtestserver.service.cf.internal for acceptance testing purposes |
| [`fips-stemcell.yml`](fips-stemcell.yml) | Contains the validated version of the FIPS-compliant stemcell |
| [`speed-up-dynamic-asgs.yml`](speed-up-dynamic-asgs.yml) | decreases the polling time for policy-server-asg-syncer and vxlan-policy-agent to speed up cf-acceptance-tests | Not suitable for production envs |
| [`set-smoke-test-timeout-scale.yml`](set-smoke-test-timeout-scale.yml) | set the timeout scale to 5 | used when retrieving logs in the smoke tests timeout. usualy happens with gcp enviorments that do not have a ephemeral ips |
6 changes: 6 additions & 0 deletions operations/test/fips-stemcell.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- type: replace
path: /stemcells/-
value:
alias: default
os: ubuntu-jammy
version: "1.406"
1 change: 1 addition & 0 deletions units/tests/test_test/operations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ enable-smb-test-server.yml:
vars:
- smb-password=FOO.PASS
- smb-username=BAR.USER
fips-stemcell.yml: {}
scale-to-one-az-addon-parallel-cats.yml:
ops:
- ../scale-to-one-az.yml
Expand Down