[ci skip] auto-update for release 4.3.0 - Changelog update

orange-cloudfoundry · Mar 16, 2020 · fb336f7 · fb336f7
1 parent 223e7c1
commit fb336f7
Show file tree

Hide file tree

Showing 12 changed files with 156 additions and 255 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/docs/features/features.html b/docs/features/features.html
@@ -479,4 +479,4 @@
   pending # Write code here that turns the phrase above into concrete actions
 end</pre></li> <script type="text/javascript">moveProgressBar('100.0');</script></ol></div><div class='scenario'><span class="scenario_file">features/offline_support.feature:9</span><h3 id="scenario_9"><span class="keyword">Scenario:</span> <span class="val">Bosh release offline</span></h3><ol><li id='' class='step skipped'><div class="step_name"><span class="keyword">But </span><span class="step val">needs documentation</span></div><div class="step_file"><span>features/step_definitions/pipeline_generation.rb:43</span></div></li> <script type="text/javascript">moveProgressBar('100.0');</script></ol></div><div class='scenario'><span class="scenario_file">features/offline_support.feature:12</span><h3 id="scenario_10"><span class="keyword">Scenario:</span> <span class="val">Private Docker registry</span></h3><ol><li id='' class='step skipped'><div class="step_name"><span class="keyword">But </span><span class="step val">NYI</span></div><div class="step_file"><span>features/step_definitions/pipeline_generation.rb:39</span></div></li> <script type="text/javascript">moveProgressBar('100.0');</script></ol></div><div class='scenario'><span class="scenario_file">features/offline_support.feature:15</span><h3 id="scenario_11"><span class="keyword">Scenario:</span> <span class="val">Bosh stemcells are retrieved from S3</span></h3><ol><li id='' class='step skipped'><div class="step_name"><span class="keyword">But </span><span class="step val">needs documentation</span></div><div class="step_file"><span>features/step_definitions/pipeline_generation.rb:43</span></div></li> <script type="text/javascript">moveProgressBar('100.0');</script></ol></div></div><div class="feature"><h2><span class="val">Feature: Terraform support for root deployment</span></h2><p class="narrative">In order to share a terraform across a root deployment<br/>As a paas-template user,<br/>I want to know mechanisms provided by COA<br/></p><div class="background"><h3 id="background_11"><span class="keyword">Background</span> <span class="val"></span></h3><ol><script>makeYellow('cucumber-header');makeYellow('background_11');</script><li id='' class='step undefined'><div class="step_name"><span class="keyword">Given </span><span class="step val">Hello world generated pipelines from reference_dataset</span></div><div class="step_file"><span>features/terraform_support_for_root_deployment.feature:7</span></div><pre>Given("Hello world generated pipelines from reference_dataset") do
   pending # Write code here that turns the phrase above into concrete actions
-end</pre></li> <script type="text/javascript">moveProgressBar('100.0');</script></ol></div><div class='scenario'><span class="scenario_file">features/terraform_support_for_root_deployment.feature:9</span><h3 id="scenario_12"><span class="keyword">Scenario:</span> <span class="val">a deployment, or a part, is done using a concourse pipeline</span></h3><ol><li id='' class='step skipped'><div class="step_name"><span class="keyword">But </span><span class="step val">needs documentation</span></div><div class="step_file"><span>features/step_definitions/pipeline_generation.rb:43</span></div></li> <script type="text/javascript">moveProgressBar('100.0');</script></ol></div></div><script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>0m1.180s seconds</strong>";</script><script type="text/javascript">document.getElementById('totals').innerHTML = "12 scenarios (10 undefined, 2 passed)<br />32 steps (10 skipped, 10 undefined, 12 passed)";</script></div></body></html>
+end</pre></li> <script type="text/javascript">moveProgressBar('100.0');</script></ol></div><div class='scenario'><span class="scenario_file">features/terraform_support_for_root_deployment.feature:9</span><h3 id="scenario_12"><span class="keyword">Scenario:</span> <span class="val">a deployment, or a part, is done using a concourse pipeline</span></h3><ol><li id='' class='step skipped'><div class="step_name"><span class="keyword">But </span><span class="step val">needs documentation</span></div><div class="step_file"><span>features/step_definitions/pipeline_generation.rb:43</span></div></li> <script type="text/javascript">moveProgressBar('100.0');</script></ol></div></div><script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>0m1.957s seconds</strong>";</script><script type="text/javascript">document.getElementById('totals').innerHTML = "12 scenarios (10 undefined, 2 passed)<br />32 steps (10 skipped, 10 undefined, 12 passed)";</script></div></body></html>
diff --git a/docs/features/features.md b/docs/features/features.md
@@ -93,7 +93,7 @@ Feature: Terraform support for root deployment
 
 12 scenarios (10 undefined, 2 passed)
 32 steps (10 skipped, 10 undefined, 12 passed)
-0m2.097s
+0m1.956s
 
 You can implement step definitions for undefined steps with these snippets:
 

diff --git a/docs/reference_dataset/pipelines/another-world-root-depls-bosh-generated.yml b/docs/reference_dataset/pipelines/another-world-root-depls-bosh-generated.yml
@@ -153,6 +153,7 @@ jobs:
             ./additional-resource/meta-inf.yml
         CUSTOM_SCRIPT_DIR: additional-resource/another-world-root-depls/template
         IAAS_TYPE: ((iaas-type))
+        PROFILES: ((profiles))
     - in_parallel:
       - task: update-cloud-config-for-another-world-root-depls
         attempts: 2
@@ -177,7 +178,8 @@ jobs:
           params:
             OLD_FILE: "another-world-root-depls/cloud-config.yml"
             NEW_FILE: "cloud-config.yml"
-            COMMIT_MESSAGE: "another-world-root-depls cloud-config auto update - [skip ci]"
+            PROFILES: ((profiles))
+            COMMIT_MESSAGE: "another-world-root-depls cloud-config auto update\n\nActive profiles: ${PROFILES}\n[skip ci]"
           on_failure:
             put: failure-alert
             params:
@@ -214,7 +216,8 @@ jobs:
           params:
             OLD_FILE: "another-world-root-depls/runtime-config.yml"
             NEW_FILE: "runtime-config.yml"
-            COMMIT_MESSAGE: "another-world-root-depls runtime-config auto update - [skip ci]"
+            PROFILES: ((profiles))
+            COMMIT_MESSAGE: "another-world-root-depls runtime-config auto update\n\nActive profiles: ${PROFILES}\n[skip ci]"
           on_failure:
             put: failure-alert
             params:
@@ -251,7 +254,8 @@ jobs:
           params:
             OLD_FILE: "another-world-root-depls/cpi-config.yml"
             NEW_FILE: "cpi-config.yml"
-            COMMIT_MESSAGE: "another-world-root-depls cpi-config auto update - [skip ci]"
+            PROFILES: ((profiles))
+            COMMIT_MESSAGE: "another-world-root-depls cpi-config auto update\n\nActive profiles: ${PROFILES}\n[skip ci]"
           on_failure:
             put: failure-alert
             params:

diff --git a/docs/reference_dataset/pipelines/another-world-root-depls-news-generated.yml b/docs/reference_dataset/pipelines/another-world-root-depls-news-generated.yml
@@ -13,8 +13,4 @@ resource_types:
       # use latest as no other recent tag available
 resources:
 jobs:
-#      - get: bosh-stemcell
-#        version: { version: ((stemcell-version)) }
-#        trigger: true
-#        attempts: 2
 - name: this-is-an-empty-pipeline
diff --git a/docs/reference_dataset/pipelines/hello-world-root-depls-bosh-generated.yml b/docs/reference_dataset/pipelines/hello-world-root-depls-bosh-generated.yml
@@ -123,19 +123,13 @@ resources:
   type: bosh-io-release
   source:
     repository: cloudfoundry-community/nginx-release
+  version: { version: ((nginx-version)) }
 - name: ntp
   icon:  home-floor-b
   type: bosh-io-release
   source:
     repository: cloudfoundry-community/ntp-release
-- name: vault
-  icon: github-circle
-  type: github-release
-  source:
-    user: cloudfoundry-community
-    repository: vault-boshrelease
-    access_token: ((bot-github-access-token))
-#  version: tag:( (-version) ) # FIXME https://github.com/concourse/concourse/issues/3990
+  version: { version: ((ntp-version)) }
 jobs:
 - name: cancel-all-bosh-tasks
   on_failure:
@@ -287,6 +281,7 @@ jobs:
             ./additional-resource/meta-inf.yml
         CUSTOM_SCRIPT_DIR: additional-resource/hello-world-root-depls/template
         IAAS_TYPE: ((iaas-type))
+        PROFILES: ((profiles))
     - in_parallel:
       - task: update-cloud-config-for-hello-world-root-depls
         attempts: 2
@@ -311,7 +306,8 @@ jobs:
           params:
             OLD_FILE: "hello-world-root-depls/cloud-config.yml"
             NEW_FILE: "cloud-config.yml"
-            COMMIT_MESSAGE: "hello-world-root-depls cloud-config auto update - [skip ci]"
+            PROFILES: ((profiles))
+            COMMIT_MESSAGE: "hello-world-root-depls cloud-config auto update\n\nActive profiles: ${PROFILES}\n[skip ci]"
           on_failure:
             put: failure-alert
             params:
@@ -348,7 +344,8 @@ jobs:
           params:
             OLD_FILE: "hello-world-root-depls/runtime-config.yml"
             NEW_FILE: "runtime-config.yml"
-            COMMIT_MESSAGE: "hello-world-root-depls runtime-config auto update - [skip ci]"
+            PROFILES: ((profiles))
+            COMMIT_MESSAGE: "hello-world-root-depls runtime-config auto update\n\nActive profiles: ${PROFILES}\n[skip ci]"
           on_failure:
             put: failure-alert
             params:
@@ -385,7 +382,8 @@ jobs:
           params:
             OLD_FILE: "hello-world-root-depls/cpi-config.yml"
             NEW_FILE: "cpi-config.yml"
-            COMMIT_MESSAGE: "hello-world-root-depls cpi-config auto update - [skip ci]"
+            PROFILES: ((profiles))
+            COMMIT_MESSAGE: "hello-world-root-depls cpi-config auto update\n\nActive profiles: ${PROFILES}\n[skip ci]"
           on_failure:
             put: failure-alert
             params:
@@ -421,15 +419,9 @@ jobs:
       params: { submodules: none}
       trigger: true
     - get: nginx
-      version: { version: ((nginx-version)) }
       trigger: true
       attempts: 2
     - get: ntp
-      version: { version: ((ntp-version)) }
-      trigger: true
-      attempts: 2
-    - get: vault
-      # vault-version is pinned, see resource declaration. This is disabled for now...
       trigger: true
       attempts: 2
     - get: secrets-bosh-deployment-sample
@@ -469,14 +461,15 @@ jobs:
           ./additional-resource/meta-inf.yml
       CUSTOM_SCRIPT_DIR: additional-resource/hello-world-root-depls/bosh-deployment-sample/template
       IAAS_TYPE: ((iaas-type))
+      PROFILES: ((profiles))
   - task: execute-bosh-deployment-sample-pre-bosh-deploy
     input_mapping:
       scripts-resource: cf-ops-automation
       template-resource: paas-templates-bosh-deployment-sample
       credentials-resource: secrets-bosh-deployment-sample
       additional-resource: release-manifest
     output_mapping: {generated-files: pre-bosh-deploy-resource}
-    file: cf-ops-automation/concourse/tasks/spiff_pre_bosh_deploy.yml
+    file: cf-ops-automation/concourse/tasks/pre_bosh_deploy.yml
     params:
       CUSTOM_SCRIPT_DIR: template-resource/hello-world-root-depls/bosh-deployment-sample/template
       SECRETS_DIR: credentials-resource/hello-world-root-depls/bosh-deployment-sample
@@ -563,7 +556,8 @@ jobs:
           params:
             OLD_FILE: hello-world-root-depls/bosh-deployment-sample/bosh-deployment-sample-last-deployment-failure.yml
             NEW_FILE: "interpolated-bosh-deployment-sample.yml"
-            COMMIT_MESSAGE: "Failed to deploy bosh-deployment-sample manifest - [skip ci]"
+            PROFILES: ((profiles))
+            COMMIT_MESSAGE: "Failed to deploy bosh-deployment-sample manifest\n\nActive profiles: ${PROFILES}\n[skip ci]"
         - put: secrets-full-writer
           get_params: {submodules: none}
           params:
@@ -577,12 +571,16 @@ jobs:
       releases: 
       - "nginx/*.tgz"
       - "ntp/*.tgz"
-      - "vault/*.tgz"
       ops_files:
       - ops-and-vars-files/operators/*
       vars_files:
       - ops-and-vars-files/vars/*
       cleanup: true
+      no_redact: false
+      dry_run: false
+      fix: false
+      recreate: true
+      skip_drain: ["ngnix"]
   - task: bosh-variables
     input_mapping: {scripts-resource: cf-ops-automation, secrets: secrets-full-writer}
     output_mapping: {result-dir: bosh-variables-result}
@@ -600,15 +598,17 @@ jobs:
     params:
       OLD_FILE: hello-world-root-depls/bosh-deployment-sample/bosh-deployment-sample-fingerprints.json
       NEW_FILE: "credential_fingerprints.json"
-      COMMIT_MESSAGE: "bosh-deployment-sample variable fingerprints auto update - [skip ci]"
+      PROFILES: ((profiles))
+      COMMIT_MESSAGE: "bosh-deployment-sample variable fingerprints auto update.\nDeployment information: $(cat generated-resource/deployment_information.txt)\nActive profiles: ${PROFILES}\n[skip ci]"
   - task: update-bosh-deployment-sample-files
-    input_mapping: {reference-resource: updated-bosh-deployment-sample-fingerprints-secrets, generated-resource: bosh-deployment-sample-deployment}
+    input_mapping: {reference-resource: updated-bosh-deployment-sample-fingerprints-secrets, generated-resource: bosh-deployment-sample-deployment, additional-resource: bosh-variables-result}
     output_mapping: {updated-git-resource: updated-bosh-deployment-sample-secrets}
     file: cf-ops-automation/concourse/tasks/git_update_a_file_from_generated.yml
     params:
       OLD_FILE: hello-world-root-depls/bosh-deployment-sample/bosh-deployment-sample.yml
       NEW_FILE: "manifest.yml"
-      COMMIT_MESSAGE: "bosh-deployment-sample generated manifest auto update - [skip ci]"
+      PROFILES: ((profiles))
+      COMMIT_MESSAGE: "bosh-deployment-sample generated manifest auto update.\nDeployment information: $(cat additional-resource/deployment_information.txt)\nActive profiles: ${PROFILES}\n[skip ci]"
   - put: secrets-full-writer
     get_params: {submodules: none}
     params:
@@ -774,7 +774,6 @@ jobs:
         - |
           echo "check-resource -r $BUILD_PIPELINE_NAME/nginx --from version:((nginx-version))" | tee -a result-dir/flight-plan
           echo "check-resource -r $BUILD_PIPELINE_NAME/ntp --from version:((ntp-version))" | tee -a result-dir/flight-plan
-          echo "check-resource -r $BUILD_PIPELINE_NAME/vault --from tag:((vault-version))" | tee -a result-dir/flight-plan
           echo "check-resource -r $BUILD_PIPELINE_NAME/((stemcell-main-name)) --from version:((stemcell-version))" | tee -a result-dir/flight-plan
       params:
         BUILD_PIPELINE_NAME: hello-world-root-depls-bosh-generated
@@ -822,13 +821,16 @@ jobs:
       CUSTOM_SCRIPT_DIR: additional-resource/hello-world-root-depls/terraform-config/template
       SUFFIX: -tpl.tfvars.yml
       IAAS_TYPE: ((iaas-type))
+      PROFILES: ((profiles))
   - task: terraform-plan
     input_mapping: {secret-state-resource: secrets-hello-world-root-depls-limited,spec-resource: paas-templates-hello-world-root-depls}
     file: cf-ops-automation/concourse/tasks/terraform_plan_cloudfoundry.yml
     params:
       SPEC_PATH: "hello-world-root-depls/terraform-config/spec"
       SECRET_STATE_FILE_PATH: "hello-world-root-depls/terraform-config"
       IAAS_SPEC_PATH: "hello-world-root-depls/terraform-config/spec-((iaas-type))"
+      PROFILES_SPEC_PATH_PREFIX: "hello-world-root-depls/terraform-config/spec-"
+      PROFILES: ((profiles))
 - name: approve-and-enforce-terraform-consistency
   serial: true
   serial_groups: [terraform]
@@ -868,6 +870,7 @@ jobs:
       CUSTOM_SCRIPT_DIR: additional-resource/hello-world-root-depls/terraform-config/template
       SUFFIX: -tpl.tfvars.yml
       IAAS_TYPE: ((iaas-type))
+      PROFILES: ((profiles))
   - task: terraform-apply
     input_mapping: {secret-state-resource: secrets-hello-world-root-depls-limited,spec-resource: paas-templates-hello-world-root-depls}
     output_mapping: {generated-files: terraform-cf}
@@ -876,6 +879,8 @@ jobs:
       SPEC_PATH: "hello-world-root-depls/terraform-config/spec"
       SECRET_STATE_FILE_PATH: "hello-world-root-depls/terraform-config"
       IAAS_SPEC_PATH: "hello-world-root-depls/terraform-config/spec-((iaas-type))"
+      PROFILES_SPEC_PATH_PREFIX: "hello-world-root-depls/terraform-config/spec-"
+      PROFILES: ((profiles))
     ensure:
       task: update-terraform-state-file
       input_mapping: {reference-resource: secrets-full-writer, generated-resource: terraform-cf}
@@ -884,7 +889,8 @@ jobs:
       params:
         OLD_FILE: "hello-world-root-depls/terraform-config/terraform.tfstate"
         NEW_FILE: "terraform.tfstate"
-        COMMIT_MESSAGE: "Terraform TFState auto update"
+        PROFILES: ((profiles))
+        COMMIT_MESSAGE: "Terraform TFState auto update\n\nActive profiles: ${PROFILES}\n[skip ci]"
       on_failure:
         put: failure-alert
         params:

diff --git a/docs/reference_dataset/pipelines/hello-world-root-depls-cf-apps-generated.yml b/docs/reference_dataset/pipelines/hello-world-root-depls-cf-apps-generated.yml
@@ -153,7 +153,8 @@ jobs:
       params:
         OLD_FILE: hello-world-root-depls/cf-apps-deployments/generic-app/generic-app_manifest.yml
         NEW_FILE: "generic-app_manifest.yml"
-        COMMIT_MESSAGE: "generic-app generated CF manifest auto update - [skip ci]"
+        PROFILES: ((profiles))
+        COMMIT_MESSAGE: "generic-app generated CF manifest auto update\n\nActive profiles: ${PROFILES}\n[skip ci]"
     - put: secrets-full-writer
       get_params: {submodules: none}
       params:

diff --git a/docs/reference_dataset/pipelines/hello-world-root-depls-concourse-generated.yml b/docs/reference_dataset/pipelines/hello-world-root-depls-concourse-generated.yml
@@ -93,10 +93,11 @@ jobs:
           ./additional-resource/meta-inf.yml
       CUSTOM_SCRIPT_DIR: additional-resource/hello-world-root-depls/pipeline-sample/concourse-pipeline-config
       IAAS_TYPE: ((iaas-type))
+      PROFILES: ((profiles))
   - task: execute-pipeline-sample-pre-deploy
     input_mapping: {scripts-resource: cf-ops-automation, template-resource: paas-templates-pipeline-sample, credentials-resource: secrets-pipeline-sample, additional-resource: spruced-files}
     output_mapping: {generated-files: pre-deploy-resource}
-    file: cf-ops-automation/concourse/tasks/spiff_pre_bosh_deploy.yml
+    file: cf-ops-automation/concourse/tasks/pre_bosh_deploy.yml
     params:
       CUSTOM_SCRIPT_DIR: template-resource/hello-world-root-depls/pipeline-sample/concourse-pipeline-config
       SECRETS_DIR: credentials-resource/hello-world-root-depls/pipeline-sample
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,7 +93,7 @@ Feature: Terraform support for root deployment @@
 scenarios (10 undefined, 2 passed)
 steps (10 skipped, 10 undefined, 12 passed)
-m2.097s
+m1.956s
     You can implement step definitions for undefined steps with these snippets:
@@ Expand Down @@