diff --git a/acceptance-tests/ipv4director/syslogrelease/smoke_suite_test.go b/acceptance-tests/ipv4director/syslogrelease/smoke_suite_test.go index 7829a30db4..850aa7550c 100644 --- a/acceptance-tests/ipv4director/syslogrelease/smoke_suite_test.go +++ b/acceptance-tests/ipv4director/syslogrelease/smoke_suite_test.go @@ -22,9 +22,11 @@ var _ = BeforeSuite(func() { bosh = testhelpers.NewBOSH() stemcellPath := testhelpers.RequireEnv("STEMCELL_PATH") syslogReleasePath := testhelpers.RequireEnv("SYSLOG_RELEASE_PATH") + bpmReleasePath := testhelpers.RequireEnv("BPM_RELEASE_PATH") bosh.UploadStemcell(stemcellPath) bosh.UploadRelease(syslogReleasePath) + bosh.UploadRelease(bpmReleasePath) bosh.SafeDeploy() }) diff --git a/ci/pipelines/builder.yml b/ci/pipelines/builder.yml index bcb62ec17b..e7f2f2a453 100644 --- a/ci/pipelines/builder.yml +++ b/ci/pipelines/builder.yml @@ -1,12 +1,95 @@ -anchors: - ci_bot: - email: &ci_bot_email infra@cloudfoundry.org - name: &ci_bot_name CI Bot - #@ load("@ytt:data", "data") -#@ bats_director_tag = "test-stemcells-" + data.values.stemcell_details.os_short_name #@yaml/text-templated-strings +--- + +#@ def metalink_resource(IAAS, HYPERVISOR, FIPS=""): + name: (@= IAAS @)-(@= HYPERVISOR @)(@= FIPS @) + type: metalink-repository + source: + mirror_files: + - destination: s3://storage.googleapis.com/bosh-core-stemcells-candidate(@= FIPS @)/(@= IAAS @)/{{.Name}} + options: + private_key: ((github_deploy_key_bosh-io-stemcells-core-index.private_key)) + filters: + - repositorypath: "*/(@= IAAS @)-(@= HYPERVISOR @)(@= FIPS @)(@= data.values.stemcell_details.agent_suffix @).meta4" + uri: git+ssh://git@github.com:cloudfoundry/bosh-io-stemcells-core-index.git//dev/(@= data.values.stemcell_details.os_name @)(@= FIPS @)/ + url_handlers: + - include: + - (s3|https)://.* + options: + access_key: ((hmac_accesskey)) + secret_key: ((hmac_secret)) + type: s3 +#@ end + +#@yaml/text-templated-strings +--- + +#@ def build_stemcell(IAAS, HYPERVISOR, FIPS=""): +name: build-(@= IAAS @)-(@= HYPERVISOR @)(@= FIPS @) +serial: true +plan: + - in_parallel: + - get: version + passed: + - build-stemcell + resource: version + trigger: true + - get: bosh-stemcells-ci + - get: os-image-stemcell-builder-registry-image + - get: build-time + passed: + - build-stemcell + trigger: true + - get: bosh-linux-stemcell-builder + passed: + - build-stemcell + resource: bosh-linux-stemcell-builder + - get: stemcells-index + - get: os-image-tarball + passed: + - build-os-image + - task: create-stemcell + file: bosh-stemcells-ci/ci/tasks/build.yml + image: os-image-stemcell-builder-registry-image + params: + HYPERVISOR: #@ HYPERVISOR + IAAS: #@ IAAS + OS_NAME: ubuntu + S3_API_ENDPOINT: storage.googleapis.com + OS_VERSION: (@= data.values.stemcell_details.os_short_name @)(@= FIPS @) + STEMCELL_BUCKET: bosh-core-stemcells-candidate(@= FIPS @) + GIT_USER_EMAIL: (@= data.values.stemcell_details.bot_email @) + GIT_USER_NAME: (@= data.values.stemcell_details.bot_name @) + AGENT_SUFFIX: (@= data.values.stemcell_details.agent_suffix @) + #@ if/end FIPS != "": + UBUNTU_ADVANTAGE_TOKEN: ((ubuntu_advantage_token)) + privileged: true + vars: + image_os_tag: (@= data.values.stemcell_details.os_short_name @) + - in_parallel: + - put: (@= IAAS @)-(@= HYPERVISOR @)(@= FIPS @) + attempts: 3 + params: + files: + - stemcell/*.tgz + rename: "{{.Version}}/(@= IAAS @)-(@= HYPERVISOR @)(@= FIPS @)(@= data.values.stemcell_details.agent_suffix @).meta4" + options: + author_email: (@= data.values.stemcell_details.bot_email @) + author_name: (@= data.values.stemcell_details.bot_name @) + message: 'dev: (@= data.values.stemcell_details.os_name @)' + version: candidate-build-number/number +#@ end + +#@yaml/text-templated-strings +--- + +anchors: + bats_director_tag: &bats-director-tag test-stemcells-(@= data.values.stemcell_details.os_short_name @) + ci_bot: + email: &ci_bot_email (@= data.values.stemcell_details.bot_email @) + name: &ci_bot_name (@= data.values.stemcell_details.bot_name @) groups: - name: build @@ -125,7 +208,7 @@ jobs: GCP_REGION: europe-north2 GCP_NETWORK_NAME: bosh-concourse SUBNET_INT: (@= data.values.stemcell_details.subnet_int @) - DIRECTOR_TAG: (@= bats_director_tag @) + DIRECTOR_TAG: *bats-director-tag - name: process-high-critical-cves serial_groups: [log-cves] @@ -367,6 +450,7 @@ jobs: - get: bosh-linux-stemcell-builder - get: bosh-deployment - get: syslog-release + - get: bpm-release - get: os-conf-release - get: stemcell passed: @@ -434,6 +518,7 @@ jobs: #! - get: bosh-linux-stemcell-builder #! - get: bosh-deployment #! - get: syslog-release +#! - get: bpm-release #! - get: os-conf-release #! - get: stemcell #! passed: @@ -483,62 +568,6 @@ jobs: #! timeout: 15m #! serial: true -#@ def build_stemcell(IAAS, HYPERVISOR, FIPS=""): - name: build-(@= IAAS @)-(@= HYPERVISOR @)(@= FIPS @) - serial: true - plan: - - in_parallel: - - get: version - passed: - - build-stemcell - resource: version - trigger: true - - get: bosh-stemcells-ci - - get: os-image-stemcell-builder-registry-image - - get: build-time - passed: - - build-stemcell - trigger: true - - get: bosh-linux-stemcell-builder - passed: - - build-stemcell - resource: bosh-linux-stemcell-builder - - get: stemcells-index - - get: os-image-tarball - passed: - - build-os-image - - task: create-stemcell - file: bosh-stemcells-ci/ci/tasks/build.yml - image: os-image-stemcell-builder-registry-image - params: - HYPERVISOR: #@ HYPERVISOR - IAAS: #@ IAAS - OS_NAME: ubuntu - S3_API_ENDPOINT: storage.googleapis.com - OS_VERSION: (@= data.values.stemcell_details.os_short_name @)(@= FIPS @) - STEMCELL_BUCKET: bosh-core-stemcells-candidate(@= FIPS @) - GIT_USER_EMAIL: *ci_bot_email - GIT_USER_NAME: *ci_bot_name - AGENT_SUFFIX: (@= data.values.stemcell_details.agent_suffix @) - #@ if/end FIPS != "": - UBUNTU_ADVANTAGE_TOKEN: ((ubuntu_advantage_token)) - privileged: true - vars: - image_os_tag: (@= data.values.stemcell_details.os_short_name @) - - in_parallel: - - put: (@= IAAS @)-(@= HYPERVISOR @)(@= FIPS @) - attempts: 3 - params: - files: - - stemcell/*.tgz - rename: "{{.Version}}/(@= IAAS @)-(@= HYPERVISOR @)(@= FIPS @)(@= data.values.stemcell_details.agent_suffix @).meta4" - options: - author_email: *ci_bot_email - author_name: *ci_bot_name - message: 'dev: (@= data.values.stemcell_details.os_name @)' - version: candidate-build-number/number -#@ end - #@ for iaas in data.values.stemcell_details.include_iaas: - #@ build_stemcell(iaas.iaas, iaas.hypervisor) #@ end @@ -596,7 +625,7 @@ jobs: GCP_PROJECT_ID: ((gcp_project_id)) GCP_ZONE: europe-north2-a GCP_SUBNET_NAME: stemcell-builder-integration-(@= data.values.stemcell_details.subnet_int @) - TAG: (@= bats_director_tag @) + TAG: *bats-director-tag - task: deploy-director file: bosh-stemcells-ci/ci/tasks/gcp/deploy-director.yml image: bosh-integration-image @@ -611,7 +640,7 @@ jobs: INTERNAL_CIDR: 10.100.(@= data.values.stemcell_details.subnet_int @).0/24 INTERNAL_GW: 10.100.(@= data.values.stemcell_details.subnet_int @).1 RESERVED_RANGE: '10.100.(@= data.values.stemcell_details.subnet_int @).2 - 10.100.(@= data.values.stemcell_details.subnet_int @).63, 10.100.(@= data.values.stemcell_details.subnet_int @).126 - 10.100.(@= data.values.stemcell_details.subnet_int @).254' - TAG: (@= bats_director_tag @) + TAG: *bats-director-tag - task: prepare-bats file: bosh-stemcells-ci/ci/tasks/bats/iaas/gcp/prepare-bats-config.yml image: bosh-integration-image @@ -827,6 +856,8 @@ jobs: output_mapping: output_repo: bosh-linux-stemcell-builder params: + GIT_USER_EMAIL: *ci_bot_email + GIT_USER_NAME: *ci_bot_name SOURCE_PATH: acceptance-tests/ - task: acceptance-tests-dry-run image: bosh-integration-image @@ -932,11 +963,11 @@ resources: - name: weekly type: time source: + initial_version: true start: 3:00 -0700 stop: 4:30 -0700 days: - Saturday - initial_version: true - name: bosh-agent type: metalink-repository @@ -944,26 +975,6 @@ resources: uri: git+https://github.com/cloudfoundry/bosh-agent-index.git/ version: "*" -#@ def metalink_resource(IAAS, HYPERVISOR, FIPS=""): - name: (@= IAAS @)-(@= HYPERVISOR @)(@= FIPS @) - type: metalink-repository - source: - mirror_files: - - destination: s3://storage.googleapis.com/bosh-core-stemcells-candidate(@= FIPS @)/(@= IAAS @)/{{.Name}} - options: - private_key: ((github_deploy_key_bosh-io-stemcells-core-index.private_key)) - filters: - - repositorypath: "*/(@= IAAS @)-(@= HYPERVISOR @)(@= FIPS @)(@= data.values.stemcell_details.agent_suffix @).meta4" - uri: git+ssh://git@github.com:cloudfoundry/bosh-io-stemcells-core-index.git//dev/(@= data.values.stemcell_details.os_name @)(@= FIPS @)/ - url_handlers: - - include: - - (s3|https)://.* - options: - access_key: ((hmac_accesskey)) - secret_key: ((hmac_secret)) - type: s3 -#@ end - #@ for iaas in data.values.stemcell_details.include_iaas: - #@ metalink_resource(iaas.iaas, iaas.hypervisor) #@ end @@ -1089,6 +1100,7 @@ resources: type: git source: branch: (@= data.values.stemcell_details.branch @) + uri: https://github.com/cloudfoundry/bosh-linux-stemcell-builder.git paths: - ci - .ruby-version @@ -1125,6 +1137,12 @@ resources: type: bosh-io-release source: repository: cloudfoundry/os-conf-release + +- name: bpm-release + type: bosh-io-release + source: + repository: cloudfoundry/bpm-release + - name: bosh-deployment type: git source: diff --git a/ci/pipelines/publisher.yml b/ci/pipelines/publisher.yml index 396b61ab68..83c1dca19f 100644 --- a/ci/pipelines/publisher.yml +++ b/ci/pipelines/publisher.yml @@ -1,17 +1,72 @@ #@ load("@ytt:data", "data") -#@ def build_light_aws_stemcell_new(name, stemcell_os, stemcell_version, builder_src, input_stemcell, output_stemcell, prefix, region, bucket_prefix, tag, ami_destinations, efi, ami_excluded_destinations): +#@yaml/text-templated-strings +--- + +#@ def build_light_aws_stemcell_new(stemcell_os, stemcell_version, builder_src, input_stemcell, output_stemcell, prefix, region, bucket_prefix, tag, ami_destinations, efi, ami_excluded_destinations): do: -- #@ get_aws_light_stemcells(input_stemcell, stemcell_os, stemcell_version, builder_src, tag) -- #@ build_light_aws_stemcell(name, builder_src, input_stemcell, output_stemcell, prefix, region, bucket_prefix, tag, ami_destinations, efi, ami_excluded_destinations) + - in_parallel: + - get: (@= input_stemcell @) + params: + include_files: + - bosh-stemcell-*-aws-xen-hvm-(@= stemcell_os @)*.tgz + resource: candidate-(@= stemcell_os @)-stemcell-(@= stemcell_version @) + trigger: true + version: every + #@ if tag != "": + tags: + - (@= tag @) + #@ end + - get: (@= builder_src @) + passed: + - test-aws-unit + - test-aws-integration + - test-aws-drivers + resource: light-aws-builder-src + #@ if tag != "": + tags: + - (@= tag @) + #@ end + - task: build-(@= region @)-stemcell + file: bosh-stemcells-ci/ci/tasks/light-aws/build.yml + image: light-stemcell-builder-registry-image + input_mapping: + builder-src: (@= builder_src @) + input-stemcell: (@= input_stemcell @) + output_mapping: + light-stemcell: (@= output_stemcell @) + params: + AWS_PAGER: + ami_access_key: ((aws_publish_(@= prefix @)_access_key)) + ami_secret_key: ((aws_publish_(@= prefix @)_secret_key)) + ami_region: ((aws_publish_(@= region @)_region)) + ami_bucket_name: ((aws_publish_(@= bucket_prefix @)_bucket)) + ami_description: Light Stemcell Builder Prod AMI + #@ if ami_destinations != "": + ami_destinations: (@= ami_destinations @) + #@ end + #@ if ami_excluded_destinations != "": + ami_excluded_destinations: (@= ami_excluded_destinations @) + #@ end + ami_encrypted: false + ami_kms_key_id: "" + ami_server_side_encryption: "" + ami_virtualization_type: hvm + ami_visibility: public + S3_API_ENDPOINT: storage.googleapis.com + efi: (@= str(efi).lower() @) + #@ if tag != "": + tags: + - (@= tag @) + #@ end #@ end #@yaml/text-templated-strings --- -#@ def cleanup_unpublished_light_stemcells(name, prefix, region): +#@ def cleanup_unpublished_light_stemcells(prefix, region): +task: cleanup-amis-in-(@= prefix @) file: bosh-stemcells-ci/ci/tasks/light-aws/cleanup-ami.yml image: bosh-integration-registry-image -task: cleanup-amis-in-(@= name @) params: AWS_PAGER: ami_access_key: ((aws_publish_(@= prefix @)_access_key)) @@ -21,10 +76,13 @@ params: ami_keep_latest: 5 os_name: (@= data.values.stemcell_details.os_name @) #@ end -#@ def cleanup_old_published_light_stemcells(name, prefix, region): + +#@yaml/text-templated-strings +--- +#@ def cleanup_old_published_light_stemcells(prefix, region): +task: cleanup-amis-in-(@= prefix @) file: bosh-stemcells-ci/ci/tasks/light-aws/cleanup-ami.yml image: bosh-integration-registry-image -task: cleanup-amis-in-(@= name @) params: AWS_PAGER: ami_access_key: ((aws_publish_(@= prefix @)_access_key)) @@ -34,199 +92,6 @@ params: remove_public_images: true #@ end -#@ def build_light_aws_stemcell(name, builder_src, input_stemcell, output_stemcell, prefix, region, bucket_prefix, tag, ami_destinations, efi, ami_excluded_destinations): -file: bosh-stemcells-ci/ci/tasks/light-aws/build.yml -task: #@ name -image: light-stemcell-builder-registry-image -input_mapping: - builder-src: (@= builder_src @) - input-stemcell: (@= input_stemcell @) -output_mapping: - light-stemcell: (@= output_stemcell @) -params: - AWS_PAGER: - ami_access_key: ((aws_publish_(@= prefix @)_access_key)) - ami_secret_key: ((aws_publish_(@= prefix @)_secret_key)) - ami_region: ((aws_publish_(@= region @)_region)) - ami_bucket_name: ((aws_publish_(@= bucket_prefix @)_bucket)) - ami_description: Light Stemcell Builder Prod AMI - #@ if ami_destinations != "": - ami_destinations: (@= ami_destinations @) - #@ end - #@ if ami_excluded_destinations != "": - ami_excluded_destinations: (@= ami_excluded_destinations @) - #@ end - ami_encrypted: false - ami_kms_key_id: "" - ami_server_side_encryption: "" - ami_virtualization_type: hvm - ami_visibility: public - S3_API_ENDPOINT: storage.googleapis.com - efi: #@ efi - #@ if tag != "": - tags: - - #@ tag - #@ end -#@ end - -#@ def get_aws_light_stemcells(input_stemcell, stemcell_os, stemcell_version, builder_src, tag): -in_parallel: -- get: (@= input_stemcell @) - params: - include_files: - - bosh-stemcell-*-aws-xen-hvm-(@= stemcell_os @)*.tgz - resource: candidate-(@= stemcell_os @)-stemcell-(@= stemcell_version @) - trigger: true - version: every - #@ if tag != "": - tags: - - #@ tag - #@ end -- get: (@= builder_src @) - passed: - - test-aws-unit - - test-aws-integration - - test-aws-drivers - resource: light-aws-builder-src - #@ if tag != "": - tags: - - #@ tag - #@ end -#@ end - -#@ def get_google_light_inputs(stemcell_os, stemcell_version): -in_parallel: -- get: stemcell - params: - include_files: - - bosh-stemcell-*-google-kvm-(@= stemcell_os @)*.tgz - resource: candidate-(@= stemcell_os @)-stemcell-(@= str(stemcell_version) @) - trigger: true - version: every -- get: bosh-stemcells-ci -- get: bosh-cpi-release - resource: bosh-google-cpi-release -#@ end - -#@ def deploy_skeletal_google_light_stemcell(terraform_resource, credentials): -do: -- params: - generate_random_name: true - terraform_source: bosh-stemcells-ci/ci/tasks/light-google/terraform/ - put: terraform - resource: (@= terraform_resource @) -- file: bosh-stemcells-ci/ci/tasks/light-google/deploy-skeletal.yml - image: bosh-integration-registry-image - params: - GCE_CREDENTIALS_JSON: (@= credentials @) - SSH_PRIVATE_KEY: ((ssh.private_key)) - task: deploy-skeletal -ensure: - ensure: - get_params: - action: destroy - params: - action: destroy - env_name_file: terraform/name - terraform_source: bosh-stemcells-ci/ci/tasks/light-google/terraform/ - put: terraform - resource: (@= terraform_resource @) - file: bosh-stemcells-ci/ci/tasks/light-google/destroy-skeletal.yml - image: bosh-integration-registry-image - task: destroy-skeletal -on_failure: - image: bosh-integration-registry-image - config: - platform: linux - run: - args: - - | - * remove artifacts of failed jobs: - ```bash - gcloud auth revoke --all # start with clean slate - gcloud auth activate-service-account concourse@((gcp_project_id)).iam.gserviceaccount.com --key-file <( ((gcp_json_key)) ) - gsutil rm gs://bosh-gce-raw-stemcells-new/STEMCELL_TO_BE_DELETED_raw.tar.gz - gsutil rm gs://bosh-gce-raw-stemcells-new/STEMCELL_TO_BE_DELETED_raw.tar.gz.sha1 - gcloud auth revoke --all - ``` - * re-fly pipeline after commenting-out `disable_manual_trigger: true` - * trigger failed jobs - * re-fly pipeline after uncommenting `disable_manual_trigger: true` - path: echo - task: cleanup-failed-run-instructions -#@ end - -#@ def run_stemcell_upload_tests(): -do: -- in_parallel: - - get: bosh-cpi-src - resource: bosh-aws-cpi-release - trigger: false - - get: cpi-release - resource: bosh-aws-cpi-dev-artifacts - trigger: false - - get: bosh-release - trigger: false - - get: bosh-deployment - trigger: false - - get: pipelines - resource: bosh-cpi-certification-concourse-tasks - - get: bosh-cpi-certification-concourse-tasks -- put: environment - resource: light-aws-environment - params: - delete_on_failure: true - generate_random_name: true - terraform_source: bosh-cpi-src/ci/assets/terraform -- file: bosh-cpi-certification-concourse-tasks/shared/tasks/prepare-director.yml - image: bosh-integration-registry-image - input_mapping: - stemcell: light-stemcell - params: - DIRECTOR_VARS_FILE: ((aws_test_director_vars_file)) - INFRASTRUCTURE: aws - OPTIONAL_OPS_FILE: | - -o pipelines/shared/assets/ops/remove-hm.yml - -o bosh-deployment/external-ip-with-registry-not-recommended.yml - -o bosh-deployment/misc/source-releases/bosh.yml - task: prepare-director -- file: bosh-cpi-certification-concourse-tasks/shared/tasks/deploy-director.yml - image: bosh-integration-registry-image - input_mapping: - stemcell: light-stemcell - task: deploy-director -- file: bosh-stemcells-ci/ci/tasks/light-aws/run-upload-test.yml - image: bosh-integration-registry-image - input_mapping: - builder-src: us-builder-src - stemcell: light-stemcell - task: run-stemcell-upload-tests -ensure: - do: - - task: teardown - file: bosh-cpi-certification-concourse-tasks/shared/tasks/teardown.yml - image: bosh-integration-registry-image - - task: ensure-terminated - file: bosh-cpi-src/ci/tasks/ensure-terminated.yml - image: bosh-integration-registry-image - input_mapping: - bosh-aws-cpi-release: bosh-cpi-src - params: - AWS_PAGER: - AWS_ACCESS_KEY_ID: ((aws_publish_us_access_key)) - AWS_SECRET_ACCESS_KEY: ((aws_publish_us_secret_key)) - AWS_DEFAULT_REGION: ((aws_publish_us_region)) - - put: environment - resource: light-aws-environment - get_params: - action: destroy - params: - action: destroy - env_name_file: environment/name - terraform_source: bosh-cpi-src/ci/assets/terraform -#@ end ---- - #@yaml/text-templated-strings --- anchors: @@ -267,8 +132,8 @@ jobs: trigger: true - get: bosh-stemcells-ci - get: bosh-integration-registry-image - - #@ cleanup_old_published_light_stemcells("aws", "us", "us") - - #@ cleanup_old_published_light_stemcells("us-goverment", "us-gov", "us-gov") + - #@ cleanup_old_published_light_stemcells("us", "us") + - #@ cleanup_old_published_light_stemcells("us-gov", "us-gov") - name: cleanup-unpublished-(@= data.values.stemcell_details.os_name @)-aws-light-stemcells serial: true plan: @@ -276,9 +141,9 @@ jobs: trigger: true - get: bosh-stemcells-ci - get: bosh-integration-registry-image - - #@ cleanup_unpublished_light_stemcells("aws", "us", "us") - - #@ cleanup_unpublished_light_stemcells("us-goverment", "us-gov", "us-gov") -#!- #@ cleanup_unpublished_light_stemcells("china", "cn", "cn_north") + - #@ cleanup_unpublished_light_stemcells("us", "us") + - #@ cleanup_unpublished_light_stemcells("us-gov", "us-gov") +#!- #@ cleanup_unpublished_light_stemcells("cn", "cn_north") - name: test-aws-unit plan: @@ -371,15 +236,82 @@ jobs: - get: bosh-integration-registry-image - in_parallel: - do: - - #@ build_light_aws_stemcell_new("build-us-gov-stemcell", data.values.stemcell_details.os_name, str(data.values.stemcell_details.major_version), "us-gov-builder-src", "us-gov-input-stemcell", "us-gov-light-stemcell", "us-gov", "us-gov", "us-gov", "", "", data.values.stemcell_details.use_efi, "") - - #@ build_light_aws_stemcell_new("build-us-stemcell", data.values.stemcell_details.os_name, str(data.values.stemcell_details.major_version), "us-builder-src", "us-input-stemcell", "us-light-stemcell", "us", "us", "us", "", "", data.values.stemcell_details.use_efi, '["me-central-1"]') + - #@ build_light_aws_stemcell_new(data.values.stemcell_details.os_name, str(data.values.stemcell_details.major_version), "us-gov-builder-src", "us-gov-input-stemcell", "us-gov-light-stemcell", "us-gov", "us-gov", "us-gov", "", "", data.values.stemcell_details.use_efi, "") + - #@ build_light_aws_stemcell_new(data.values.stemcell_details.os_name, str(data.values.stemcell_details.major_version), "us-builder-src", "us-input-stemcell", "us-light-stemcell", "us", "us", "us", "", "", data.values.stemcell_details.use_efi, '["me-central-1"]') - file: bosh-stemcells-ci/ci/tasks/light-aws/us-gov-merge-builds.yml image: light-stemcell-builder-registry-image input_mapping: builder-src: us-builder-src task: merge-builds - - #@ run_stemcell_upload_tests() - - params: + - do: + - in_parallel: + - get: bosh-cpi-src + resource: bosh-aws-cpi-release + trigger: false + - get: cpi-release + resource: bosh-aws-cpi-dev-artifacts + trigger: false + - get: bosh-release + trigger: false + - get: bosh-deployment + trigger: false + - get: pipelines + resource: bosh-cpi-certification-concourse-tasks + - get: bosh-cpi-certification-concourse-tasks + - put: environment + resource: light-aws-environment + params: + delete_on_failure: true + generate_random_name: true + terraform_source: bosh-cpi-src/ci/assets/terraform + - task: prepare-director + file: bosh-cpi-certification-concourse-tasks/shared/tasks/prepare-director.yml + image: bosh-integration-registry-image + input_mapping: + stemcell: light-stemcell + params: + DIRECTOR_VARS_FILE: ((aws_test_director_vars_file)) + INFRASTRUCTURE: aws + OPTIONAL_OPS_FILE: | + -o pipelines/shared/assets/ops/remove-hm.yml + -o bosh-deployment/external-ip-with-registry-not-recommended.yml + -o bosh-deployment/misc/source-releases/bosh.yml + - task: deploy-director + file: bosh-cpi-certification-concourse-tasks/shared/tasks/deploy-director.yml + image: bosh-integration-registry-image + input_mapping: + stemcell: light-stemcell + - task: run-stemcell-upload-tests + file: bosh-stemcells-ci/ci/tasks/light-aws/run-upload-test.yml + image: bosh-integration-registry-image + input_mapping: + builder-src: us-builder-src + stemcell: light-stemcell + ensure: + do: + - task: teardown + file: bosh-cpi-certification-concourse-tasks/shared/tasks/teardown.yml + image: bosh-integration-registry-image + - task: ensure-terminated + file: bosh-cpi-src/ci/tasks/ensure-terminated.yml + image: bosh-integration-registry-image + input_mapping: + bosh-aws-cpi-release: bosh-cpi-src + params: + AWS_PAGER: + AWS_ACCESS_KEY_ID: ((aws_publish_us_access_key)) + AWS_SECRET_ACCESS_KEY: ((aws_publish_us_secret_key)) + AWS_DEFAULT_REGION: ((aws_publish_us_region)) + - put: environment + resource: light-aws-environment + get_params: + action: destroy + params: + action: destroy + env_name_file: environment/name + terraform_source: bosh-cpi-src/ci/assets/terraform + - put: candidate-aws-light-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @) + params: files: - light-stemcell/*.tgz options: @@ -387,12 +319,21 @@ jobs: author_name: *ci_bot_name message: 'candidate (light aws): (@= data.values.stemcell_details.os_name @)/(@= str(data.values.stemcell_details.major_version) @).x' version: us-input-stemcell/.resource/version - put: candidate-aws-light-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @) serial: true - name: build-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @) plan: - - #@ get_google_light_inputs(data.values.stemcell_details.os_name, str(data.values.stemcell_details.major_version)) + - in_parallel: + - get: stemcell + params: + include_files: + - bosh-stemcell-*-google-kvm-(@= data.values.stemcell_details.os_name @)*.tgz + resource: candidate-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @) + trigger: true + version: every + - get: bosh-stemcells-ci + - get: bosh-cpi-release + resource: bosh-google-cpi-release - get: light-stemcell-builder-registry-image - get: gce-cpi-release-registry-image - get: bosh-integration-registry-image @@ -414,8 +355,51 @@ jobs: GCP_SERVICE_ACCOUNT_KEY: ((gcp_json_key)) PROJECT_NAME: ((gcp_project_id)) EFI: #@ data.values.stemcell_details.use_efi - - - #@ deploy_skeletal_google_light_stemcell("light-google-environment-oss", "((gcp_json_key))") + - do: + - put: terraform + resource: light-google-environment-oss + params: + generate_random_name: true + terraform_source: bosh-stemcells-ci/ci/tasks/light-google/terraform/ + - task: deploy-skeletal + file: bosh-stemcells-ci/ci/tasks/light-google/deploy-skeletal.yml + image: bosh-integration-registry-image + params: + GCE_CREDENTIALS_JSON: ((gcp_json_key)) + SSH_PRIVATE_KEY: ((ssh.private_key)) + ensure: + ensure: + get_params: + action: destroy + params: + action: destroy + env_name_file: terraform/name + terraform_source: bosh-stemcells-ci/ci/tasks/light-google/terraform/ + put: terraform + resource: light-google-environment-oss + file: bosh-stemcells-ci/ci/tasks/light-google/destroy-skeletal.yml + image: bosh-integration-registry-image + task: destroy-skeletal + on_failure: + image: bosh-integration-registry-image + config: + platform: linux + run: + args: + - | + * remove artifacts of failed jobs: + ```bash + gcloud auth revoke --all # start with clean slate + gcloud auth activate-service-account concourse@((gcp_project_id)).iam.gserviceaccount.com --key-file <( ((gcp_json_key)) ) + gsutil rm gs://bosh-gce-raw-stemcells-new/STEMCELL_TO_BE_DELETED_raw.tar.gz + gsutil rm gs://bosh-gce-raw-stemcells-new/STEMCELL_TO_BE_DELETED_raw.tar.gz.sha1 + gcloud auth revoke --all + ``` + * re-fly pipeline after commenting-out `disable_manual_trigger: true` + * trigger failed jobs + * re-fly pipeline after uncommenting `disable_manual_trigger: true` + path: echo + task: cleanup-failed-run-instructions - params: files: - light-stemcell/*.tgz diff --git a/ci/pipelines/vars.yml b/ci/pipelines/vars.yml index bd62c23198..6d7890ccbc 100644 --- a/ci/pipelines/vars.yml +++ b/ci/pipelines/vars.yml @@ -9,6 +9,8 @@ stemcell_details: os_short_name: resolute subnet_int: "26" #! use last two digits of release year: ex 2010 -> 10 use_efi: true + bot_email: infra@cloudfoundry.org + bot_name: CI Bot include_iaas: [ {iaas: alicloud, hypervisor: kvm}, {iaas: aws, hypervisor: xen-hvm}, diff --git a/ci/tasks/test-stemcell.sh b/ci/tasks/test-stemcell.sh index 094e7c6af6..ba50164d6a 100755 --- a/ci/tasks/test-stemcell.sh +++ b/ci/tasks/test-stemcell.sh @@ -16,6 +16,7 @@ BOSH_CLIENT_SECRET="$(bosh int "${REPO_PARENT}/director-state/director-creds.yml BOSH_ENVIRONMENT="$(bosh int "${REPO_PARENT}/director-state/director-creds.yml" --path /internal_ip)" SYSLOG_RELEASE_PATH="$(realpath "${REPO_PARENT}/syslog-release"/*.tgz)" OS_CONF_RELEASE_PATH="$(realpath "${REPO_PARENT}/os-conf-release"/*.tgz)" +BPM_RELEASE_PATH="$(realpath "${REPO_PARENT}/bpm-release"/*.tgz)" STEMCELL_PATH="$(realpath "${REPO_PARENT}/stemcell"/*.tgz)" # Quote value since the bosh CLI YAML parses it which results in `0.40` becoming `0.4` # shellcheck disable=SC2089 @@ -28,6 +29,7 @@ export BOSH_CLIENT_SECRET export BOSH_ENVIRONMENT export SYSLOG_RELEASE_PATH export OS_CONF_RELEASE_PATH +export BPM_RELEASE_PATH export STEMCELL_PATH export BOSH_stemcell_version diff --git a/ci/tasks/test-stemcell.yml b/ci/tasks/test-stemcell.yml index c1c26e398c..2384206ebe 100644 --- a/ci/tasks/test-stemcell.yml +++ b/ci/tasks/test-stemcell.yml @@ -7,6 +7,7 @@ inputs: - name: stemcell - name: syslog-release - name: os-conf-release +- name: bpm-release - name: director-state params: diff --git a/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 b/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 index c8faadd4ab..f04bc3f6da 100644 --- a/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 +++ b/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 @@ -1,22 +1,22 @@ - b748ba44907447a03a8e161b370795221f94961f42d59684a5d3f5aef3d48aa523dca132825ce1abf983fca1fc96532c2db9bffbcf4d71714bcff63b5026d62f - a4fff818d92a51015e05337bc3085a06696122f2bff31cdd2053957d99b9ee25 - ab89630e24048ea311a4ee6a2964d3e1998177ed - 25d8f6bba0a5e43838922b5f704e580d - 435207580 + 31dea7af0f628a67ab91ebbe4005d0b89873b9aa7560a722b5665dc418a30dc0220241782b826ac0d5c45d369c7e9401e5f90afb6a2cd54d2300e86be1c77812 + 480707f5a3eff94e8668fdffceccc3d135b6999ff9f14e21cd8b5dfd2d7d63c2 + 84a9075825fce098b1fba916c4862556a16588d0 + ab7f1a3bea00723d2522362d6931a003 + 435213458 https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz - 1089.0.0 + 1105.0.0 - 04c6305dd88f1f0fdb8c052c3161682a0320751c96e6e5b6bc0b948bd3c0745d250ff57be25a11e69c1cbc1faf49d6e4dbd9f16163ccdc6ee61f6bdb89e13732 - 52256f7644d5e043f59cd3799675e5b76577fc57b7ccac248349ec4a382b2643 - 17fb83a8835fffe0fa223470bd10451554cf9ca9 - d6447fb301e142d191d4d2ce0a39ae2b - 8289 + be688838ca8686e5c90689bf2ab585cef1137c999b48c70b92f67a5c34dc15697b5d11c982ed6d71be1e1e7f7b4e0733884aa97c3f7a339a8ed03577cf74be09 + 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b + adc83b19e793491b1c6ea0fd8b46cd9f32e592fc + 68b329da9893e34099c7d8ad5cb9c940 + 1 https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/usn-log.json - 1089.0.0 + 1105.0.0 metalink-repository-resource/0.0.0 - 2026-06-12T19:44:25.082634332Z + 2026-06-18T22:29:21.024149406Z diff --git a/image-metalinks/ubuntu-noble/ubuntu-noble.meta4 b/image-metalinks/ubuntu-noble/ubuntu-noble.meta4 index 7fe006016b..97f3dfd68e 100644 --- a/image-metalinks/ubuntu-noble/ubuntu-noble.meta4 +++ b/image-metalinks/ubuntu-noble/ubuntu-noble.meta4 @@ -1,12 +1,12 @@ - abaf1e872ab5fae378ba869e97994d26b0c390296abf57f57e1ee32b55c113247174b31daa2e3ebddd7218013ef5e3fb90015ea4e2e253bf57e9104db527b4e7 - 235331e441d4594d54a8fa33120091414eef646b20518b8ecb697f84160b7d40 - af7b9a5f1b8a419061d8b48c7d2f63d7721ff542 - 59fd4f46b08051601c69976b106bf6fc - 377555609 + 00a885490bd7be17da5ad861b473080660cd471ca16f37fd93342fadf7bccb74756c2e82abc028cef7c857193096a7f98aebc45fe19e5988387cc1cdce7d9ce2 + d99124e0798a66582ec2bf73090aa012fc9577912977eaa28ad9dcfac59864cb + 2db51e8336075e1b4ca870412c167927abfefd6b + fd8bb35a87cf83b82f5c17ea473d1207 + 374571238 https://storage.googleapis.com/bosh-os-images/ubuntu-noble/ubuntu-noble.tgz - 120.0.0 + 136.0.0 be253863f3ed36a79daa272c9f23f902422486f46fb84114da8dcb42ce48610048cafa8021e0122c8adf468f9f4c81472a1795db6290f8747a4c8cf5bcdeb18c @@ -15,8 +15,8 @@ b1e24e5bb6d70a57b4d282b948136d67 8523 https://storage.googleapis.com/bosh-os-images/ubuntu-noble/usn-log.json - 120.0.0 + 136.0.0 metalink-repository-resource/0.0.0 - 2026-06-12T12:04:33.476081292Z + 2026-06-18T22:55:58.219185055Z diff --git a/stemcell_builder/stages/bosh_alicloud_agent_settings/apply.sh b/stemcell_builder/stages/bosh_alicloud_agent_settings/apply.sh index 206499c44b..50c735abb0 100755 --- a/stemcell_builder/stages/bosh_alicloud_agent_settings/apply.sh +++ b/stemcell_builder/stages/bosh_alicloud_agent_settings/apply.sh @@ -3,4 +3,5 @@ base_dir=$(readlink -nf $(dirname $0)/../..) source $base_dir/lib/prelude_apply.bash -cp $assets_dir/agent.json $chroot/var/vcap/bosh/agent.json +# shellcheck disable=SC2154 +cp "$assets_dir/agent.json" "$chroot/var/vcap/bosh/agent.json" diff --git a/stemcell_builder/stages/bosh_alicloud_agent_settings/assets/agent.json b/stemcell_builder/stages/bosh_alicloud_agent_settings/assets/agent.json index b94e416daa..053668a8da 100644 --- a/stemcell_builder/stages/bosh_alicloud_agent_settings/assets/agent.json +++ b/stemcell_builder/stages/bosh_alicloud_agent_settings/assets/agent.json @@ -24,4 +24,4 @@ "UseRegistry": true } } -} \ No newline at end of file +} diff --git a/stemcell_builder/stages/bosh_aws_agent_settings/apply.sh b/stemcell_builder/stages/bosh_aws_agent_settings/apply.sh index 206499c44b..50c735abb0 100755 --- a/stemcell_builder/stages/bosh_aws_agent_settings/apply.sh +++ b/stemcell_builder/stages/bosh_aws_agent_settings/apply.sh @@ -3,4 +3,5 @@ base_dir=$(readlink -nf $(dirname $0)/../..) source $base_dir/lib/prelude_apply.bash -cp $assets_dir/agent.json $chroot/var/vcap/bosh/agent.json +# shellcheck disable=SC2154 +cp "$assets_dir/agent.json" "$chroot/var/vcap/bosh/agent.json" diff --git a/stemcell_builder/stages/bosh_azure_agent_settings/apply.sh b/stemcell_builder/stages/bosh_azure_agent_settings/apply.sh index 206499c44b..50c735abb0 100755 --- a/stemcell_builder/stages/bosh_azure_agent_settings/apply.sh +++ b/stemcell_builder/stages/bosh_azure_agent_settings/apply.sh @@ -3,4 +3,5 @@ base_dir=$(readlink -nf $(dirname $0)/../..) source $base_dir/lib/prelude_apply.bash -cp $assets_dir/agent.json $chroot/var/vcap/bosh/agent.json +# shellcheck disable=SC2154 +cp "$assets_dir/agent.json" "$chroot/var/vcap/bosh/agent.json" diff --git a/stemcell_builder/stages/bosh_azure_agent_settings/assets/agent.json b/stemcell_builder/stages/bosh_azure_agent_settings/assets/agent.json index 4270848196..2becd50ea6 100644 --- a/stemcell_builder/stages/bosh_azure_agent_settings/assets/agent.json +++ b/stemcell_builder/stages/bosh_azure_agent_settings/assets/agent.json @@ -21,4 +21,4 @@ "UseServerName": true } } -} \ No newline at end of file +} diff --git a/stemcell_builder/stages/bosh_cloudstack_agent_settings/apply.sh b/stemcell_builder/stages/bosh_cloudstack_agent_settings/apply.sh index 206499c44b..50c735abb0 100755 --- a/stemcell_builder/stages/bosh_cloudstack_agent_settings/apply.sh +++ b/stemcell_builder/stages/bosh_cloudstack_agent_settings/apply.sh @@ -3,4 +3,5 @@ base_dir=$(readlink -nf $(dirname $0)/../..) source $base_dir/lib/prelude_apply.bash -cp $assets_dir/agent.json $chroot/var/vcap/bosh/agent.json +# shellcheck disable=SC2154 +cp "$assets_dir/agent.json" "$chroot/var/vcap/bosh/agent.json" diff --git a/stemcell_builder/stages/bosh_cloudstack_agent_settings/assets/agent.json b/stemcell_builder/stages/bosh_cloudstack_agent_settings/assets/agent.json index eb22f17acf..6e6af37de9 100644 --- a/stemcell_builder/stages/bosh_cloudstack_agent_settings/assets/agent.json +++ b/stemcell_builder/stages/bosh_cloudstack_agent_settings/assets/agent.json @@ -22,4 +22,4 @@ "UseRegistry": true } } -} \ No newline at end of file +} diff --git a/stemcell_builder/stages/bosh_go_agent/assets/bosh-agent-version b/stemcell_builder/stages/bosh_go_agent/assets/bosh-agent-version index a048c682bf..a5a6cf9909 100644 --- a/stemcell_builder/stages/bosh_go_agent/assets/bosh-agent-version +++ b/stemcell_builder/stages/bosh_go_agent/assets/bosh-agent-version @@ -1 +1 @@ -2.855.0 \ No newline at end of file +2.855.0 diff --git a/stemcell_builder/stages/bosh_go_agent/assets/metalink.meta4 b/stemcell_builder/stages/bosh_go_agent/assets/metalink.meta4 index d24f7defcf..1cc0b5c133 100644 --- a/stemcell_builder/stages/bosh_go_agent/assets/metalink.meta4 +++ b/stemcell_builder/stages/bosh_go_agent/assets/metalink.meta4 @@ -1,49 +1,49 @@ - - 9a41b7f85eaaca5169480e2b3cda140996cceeffed1320babb791d0833eb5d77041de189c908243379ffc76c85dcd92c7cc7c9bd75325f8b086e47a10ecf60c4 - 8ec8f6e42f0247db632b61f4b4cc2198c4a2815682463a35d646b679fa5a3ff9 - 578b0179b705b0cb46555f5b0ed9d37a04ce5a55 - e9c6ae947cf8a8dfc9a2cde726a81512 - 22091114 - https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-2.855.0-linux-amd64 - 2.855.0 + + 9039c8e1b89cbdf0000b60da9dcb0e27ec3d87fcb7820fd78b492bc6037006300d06f131648993c5720e2e1ff176b4f08ba8463842d441ee628dc28f4565945e + 7686ee43917d67c7014a85e9caf2f17ce3dcdd1a81f1c7a1569f09e16a780bc8 + 0ada42ae024fd3a100fe7789b32c0bfa8571d62e + 8e10cb22e8c9943f4d7f841f9bd6d63c + 22114657 + https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-2.859.0-linux-amd64 + 2.859.0 - - 34eabe2139be95ce35d69ffdcd2ebf7702e15b3e152c259a52308271c5ca52e138252e84da48273fcefdff262e64b09f2341740a44375ff45b5842279dd5e6a6 - 41cc7bdcb7de492d40263718bae11a6965729432e469a89eb1ec7792894e89d1 - eef6277a1b3b905438467e936646fc474a0f91d5 - 5f42852f6d4a5077bbeb903bac4b777b - 21939712 - https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-2.855.0-windows-amd64.exe - 2.855.0 + + a7c3f3e109b931d99c52ff19ce6f07fb8912a3596373cc63cd84ab946d4f779f3f788a672acd61747972bb4895f7891a048254a4ade64427b0cb9f878b49e374 + 0973dde0228e87b2f47d90df02e330290dd915cd3c054c646c689bc3828d920f + a768eec34975559281177e231c4c38f2d027cdd4 + c60c66d8cb16899345c9243dd108aa92 + 21964800 + https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-2.859.0-windows-amd64.exe + 2.859.0 - - 0ddeca4bf31e69039e94d3b879554b2d62e0ba01bde1219f177e154413574bacec3ad74c708b9c23c6ecabda363495a0a79714f8457afc9ede378517858a4b39 - 13f553a54e4404157dd3f119607f601d8918defc2933f32ee3e5ec98ae0b91e3 - 7dfd4a761ea9c10e9acc205b9bd35c0ba63843f9 - 89bcea919581415167ed24fd666c7f10 + + 2fa99c1eac61cbc3ff006aa058305fb2e462d03e2c11d0270ffaedc5278c6c16355d7f852c6d598bc73c4a717776d6c7b57bcd8d10ca51936a45d54d02f073cc + ed1b6f0ff9b6a6558a40231346b73b1482560baf5ebfe78abbcea782b7b403f7 + d13ceb7bd498aaffd60984ae949fa846cd7f1637 + 8f067c48d218768def0315436064a2c6 9023488 - https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-pipe-2.855.0-windows-amd64.exe - 2.855.0 + https://s3-external-1.amazonaws.com/bosh-agent-binaries/bosh-agent-pipe-2.859.0-windows-amd64.exe + 2.859.0 - - a19ec0f7a1020bbc8f13196165a49e385daabbb8f0aa8f6f5803d3e8211bf5230775c643d4f2668a3703ad9aac3efb745dcb48a7e812609858ba511818d849ed - 1f93632c81467a40833f954ef4576d298c00e1c7865e8a3cae1e52d42025a086 - b4c287de7c28df11e72e4df15de87e031ff70ea0 - 3005b0a50b0d3f49c8599901bfc504d3 + + 00c6b25f84e149ec00bf4dd7a46a4b81e3a423640b31bf609c54d5d9eb767adf7a9abfaf47719a451a24a47c5c719f6990a0ded6f3129fc2e0ff10f53c03c71e + d77a3d39b882846d20339b5efccd60e7c9b9e5a3b9e359e41527aabbbcb123b7 + bcfd97fc08d6df9be02072b9b84512e297a73e2b + 7f2cda484f2aee1e95f94a96e9267759 9 - https://s3-external-1.amazonaws.com/bosh-agent-binaries/git-sha-2.855.0 - 2.855.0 + https://s3-external-1.amazonaws.com/bosh-agent-binaries/git-sha-2.859.0 + 2.859.0 - + fe22cd6fd90ded459b08385497032f2de4022f712dc753dc026ffbc024d3cdd5007f68886f0d4dd8a7832ece138455c3320ce65b72eec054ed3717f6212a7567 a1f4729600504b0cc026ff5e826bb403b43a564780e091d01e0ab7bacb15906a a5a1e59f6bfaa23bffb85a6647bfbc3df1dbf594 c0e9e8c1a9510c750742534ba431530b 708 - https://s3-external-1.amazonaws.com/bosh-agent-binaries/service_wrapper-2.855.0.xml - 2.855.0 + https://s3-external-1.amazonaws.com/bosh-agent-binaries/service_wrapper-2.859.0.xml + 2.859.0 metalink-repository-resource/0.0.0 - 2026-06-12T05:40:08.738904926Z + 2026-06-18T03:37:15.441338729Z diff --git a/stemcell_builder/stages/bosh_google_agent_settings/apply.sh b/stemcell_builder/stages/bosh_google_agent_settings/apply.sh index 206499c44b..50c735abb0 100755 --- a/stemcell_builder/stages/bosh_google_agent_settings/apply.sh +++ b/stemcell_builder/stages/bosh_google_agent_settings/apply.sh @@ -3,4 +3,5 @@ base_dir=$(readlink -nf $(dirname $0)/../..) source $base_dir/lib/prelude_apply.bash -cp $assets_dir/agent.json $chroot/var/vcap/bosh/agent.json +# shellcheck disable=SC2154 +cp "$assets_dir/agent.json" "$chroot/var/vcap/bosh/agent.json" diff --git a/stemcell_builder/stages/bosh_google_agent_settings/assets/agent.json b/stemcell_builder/stages/bosh_google_agent_settings/assets/agent.json index ca27217458..dd5b29e960 100644 --- a/stemcell_builder/stages/bosh_google_agent_settings/assets/agent.json +++ b/stemcell_builder/stages/bosh_google_agent_settings/assets/agent.json @@ -27,4 +27,4 @@ "UseRegistry": false } } -} \ No newline at end of file +} diff --git a/stemcell_builder/stages/bosh_openstack_agent_settings/apply.sh b/stemcell_builder/stages/bosh_openstack_agent_settings/apply.sh index 206499c44b..50c735abb0 100755 --- a/stemcell_builder/stages/bosh_openstack_agent_settings/apply.sh +++ b/stemcell_builder/stages/bosh_openstack_agent_settings/apply.sh @@ -3,4 +3,5 @@ base_dir=$(readlink -nf $(dirname $0)/../..) source $base_dir/lib/prelude_apply.bash -cp $assets_dir/agent.json $chroot/var/vcap/bosh/agent.json +# shellcheck disable=SC2154 +cp "$assets_dir/agent.json" "$chroot/var/vcap/bosh/agent.json" diff --git a/stemcell_builder/stages/bosh_openstack_agent_settings/assets/agent.json b/stemcell_builder/stages/bosh_openstack_agent_settings/assets/agent.json index a6e17ce018..6e1c5a18d7 100644 --- a/stemcell_builder/stages/bosh_openstack_agent_settings/assets/agent.json +++ b/stemcell_builder/stages/bosh_openstack_agent_settings/assets/agent.json @@ -38,4 +38,4 @@ "UseRegistry": true } } -} \ No newline at end of file +} diff --git a/stemcell_builder/stages/bosh_softlayer_agent_settings/assets/agent.json b/stemcell_builder/stages/bosh_softlayer_agent_settings/assets/agent.json new file mode 100644 index 0000000000..b417f23595 --- /dev/null +++ b/stemcell_builder/stages/bosh_softlayer_agent_settings/assets/agent.json @@ -0,0 +1,24 @@ +{ + "Platform": { + "Linux": { + "PartitionerType": "parted", + "CreatePartitionIfNoEphemeralDisk": true, + "ScrubEphemeralDisk": true, + "DevicePathResolutionType": "iscsi", + "UseMonitIptablesFirewall": true + } + }, + "Infrastructure": { + "Settings": { + "Sources": [ + { + "Type": "HTTP", + "URI": "https://api.service.softlayer.com", + "UserDataPath": "/rest/v3.1/SoftLayer_Resource_Metadata/getUserMetadata.json" + } + ], + "UseServerName": true, + "UseRegistry": true + } + } +} diff --git a/stemcell_builder/stages/bosh_vsphere_agent_settings/apply.sh b/stemcell_builder/stages/bosh_vsphere_agent_settings/apply.sh index 206499c44b..50c735abb0 100755 --- a/stemcell_builder/stages/bosh_vsphere_agent_settings/apply.sh +++ b/stemcell_builder/stages/bosh_vsphere_agent_settings/apply.sh @@ -3,4 +3,5 @@ base_dir=$(readlink -nf $(dirname $0)/../..) source $base_dir/lib/prelude_apply.bash -cp $assets_dir/agent.json $chroot/var/vcap/bosh/agent.json +# shellcheck disable=SC2154 +cp "$assets_dir/agent.json" "$chroot/var/vcap/bosh/agent.json" diff --git a/stemcell_builder/stages/bosh_vsphere_agent_settings/assets/agent.json b/stemcell_builder/stages/bosh_vsphere_agent_settings/assets/agent.json index 5c5c32a182..d8288f1fb4 100644 --- a/stemcell_builder/stages/bosh_vsphere_agent_settings/assets/agent.json +++ b/stemcell_builder/stages/bosh_vsphere_agent_settings/assets/agent.json @@ -11,7 +11,8 @@ "Sources": [ { "Type": "VsphereGuestInfo" - }, { + }, + { "Type": "CDROM", "FileName": "env" }