Speed up integration tests

.gitignore

@@ -4,6 +4,14 @@
 .idea
 *.iml
 
+# nginx package blob files extracted by nginx_service.rb NginxInstaller#prepare
+# (source tarballs + packaging script downloaded from GCS blobstore)
+packages/nginx/packaging
+packages/nginx/*.tar.gz
+packages/nginx/*.gz
+packages/nginx/runtime.env
+packages/nginx/.blob-fingerprint
+
 **/*/private.yml
 .blobs
 .dev_builds

ci/pipeline.yml

@@ -320,6 +320,7 @@ jobs:
           - get: bosh-agent
           - get: integration-postgres-15-image
           - get: config-server
+          - get: release-details
       - task: tests
         file: bosh-ci/ci/tasks/test-rake-task.yml
         image: integration-postgres-15-image
@@ -328,6 +329,10 @@ jobs:
           DB: postgresql
           RAKE_TASK: spec:integration
           PARALLEL_TEST_MULTIPLY_PROCESSES: &parallel_test_multiplier "0.6"
+      - put: release-details
+        params:
+          repository: release-details
+          rebase: true
 
   - name: integration-postgres-hotswap
     public: true
@@ -349,6 +354,7 @@ jobs:
           - get: bosh-agent
           - get: integration-postgres-15-image
           - get: config-server
+          - get: release-details
       - task: tests
         file: bosh-ci/ci/tasks/test-rake-task.yml
         image: integration-postgres-15-image
@@ -358,6 +364,10 @@ jobs:
           RAKE_TASK: spec:integration
           PARALLEL_TEST_MULTIPLY_PROCESSES: *parallel_test_multiplier
           UPDATE_VM_STRATEGY: create-swap-delete
+      - put: release-details
+        params:
+          repository: release-details
+          rebase: true
 
   - name: integration-mysql
     public: true
@@ -379,6 +389,7 @@ jobs:
           - get: bosh-agent
           - get: integration-mysql-8-0-image
           - get: config-server
+          - get: release-details
       - task: tests
         file: bosh-ci/ci/tasks/test-rake-task.yml
         image: integration-mysql-8-0-image
@@ -387,6 +398,10 @@ jobs:
           DB: mysql
           RAKE_TASK: spec:integration
           PARALLEL_TEST_MULTIPLY_PROCESSES: *parallel_test_multiplier
+      - put: release-details
+        params:
+          repository: release-details
+          rebase: true
 
   - name: candidate-release
     plan:
@@ -1864,6 +1879,13 @@ resources:
       private_key: ((github_deploy_key_bosh.private_key))
       initial_version: 282.1.17
 
+  - name: release-details
+    type: git
+    source:
+      uri: git@github.com:cloudfoundry/bosh.git
+      branch: release-details
+      private_key: ((github_deploy_key_bosh.private_key))
+
   - name: bosh-candidate-release-tarballs
     type: gcs-resource
     source:

ci/tasks/test-rake-task.sh

@@ -221,6 +221,10 @@ if [ -d bosh-cli ] ; then
   install bosh-cli/*bosh-cli-*-linux-amd64 "/usr/local/bin/bosh"
 fi
 
+if [ -d release-details/.git ]; then
+  export PARALLEL_RUNTIME_LOG="$(pwd)/release-details/parallel_spec_runtimes/integration_${DB}_${UPDATE_VM_STRATEGY:-delete-create}.log"
+fi
+
 start_db "${DB}"
 
 pushd bosh/src
@@ -232,3 +236,10 @@ pushd bosh/src
 
   bundle exec rake --trace "${RAKE_TASK}"
 popd
+
+if [ -d "release-details/.git" ] && [ -n "${PARALLEL_RUNTIME_LOG:-}" ] && [ -s "${PARALLEL_RUNTIME_LOG}" ]; then
+  git -C release-details config user.name "CF-Bosh CI-Bot"
+  git -C release-details config user.email "cf-bosh-ci-bot@localhost"
+  git -C release-details add "parallel_spec_runtimes/integration_${DB}_${UPDATE_VM_STRATEGY:-delete-create}.log"
+  git -C release-details diff --staged --quiet || git -C release-details commit -m "Update parallel_runtime_rspec log for ${DB} ${UPDATE_VM_STRATEGY:-delete-create}"
+fi

ci/tasks/test-rake-task.yml

@@ -10,6 +10,11 @@ inputs:
     optional: true
   - name: config-server
     optional: true
+  - name: release-details
+    optional: true
+
+outputs:
+  - name: release-details
 
 run:
   path: bosh-ci/ci/tasks/test-rake-task.sh

src/spec/integration/cli_instances_spec.rb

@@ -2,7 +2,7 @@
 
 describe 'cli: deployment process', type: :integration do
   include IntegrationSupport::CreateReleaseOutputParsers
-  with_reset_sandbox_before_each
+  with_reset_sandbox_before_all
 
   it 'displays instances in a deployment' do
     cloud_config_hash = SharedSupport::DeploymentManifestHelper.simple_cloud_config

src/spec/integration/deploy/dry_run_spec.rb

@@ -1,45 +1,63 @@
 require 'spec_helper'
 
 describe 'dry run', type: :integration do
-  with_reset_sandbox_before_each
+  context 'when no actual deployment is created' do
+    with_reset_sandbox_before_all
 
-  context 'when there are template errors' do
-    it 'prints all template evaluation errors and does not register an event' do
-      manifest_hash = SharedSupport::DeploymentManifestHelper.simple_manifest_with_instance_groups
-      manifest_hash['instance_groups'] = [
-        {
-          'name' => 'foobar',
-          'jobs' => ['name' => 'foobar_with_bad_properties', 'release' => 'bosh-release'],
-          'vm_type' => 'a',
-          'instances' => 1,
-          'networks' => [{
-            'name' => 'a',
-          }],
-          'stemcell' => 'default',
-        },
-      ]
+    context 'when there are template errors' do
+      it 'prints all template evaluation errors and does not register an event' do
+        manifest_hash = SharedSupport::DeploymentManifestHelper.simple_manifest_with_instance_groups
+        manifest_hash['instance_groups'] = [
+          {
+            'name' => 'foobar',
+            'jobs' => ['name' => 'foobar_with_bad_properties', 'release' => 'bosh-release'],
+            'vm_type' => 'a',
+            'instances' => 1,
+            'networks' => [{
+              'name' => 'a',
+            }],
+            'stemcell' => 'default',
+          },
+        ]
 
-      output = deploy_from_scratch(
-        manifest_hash: manifest_hash,
-        cloud_config_hash: SharedSupport::DeploymentManifestHelper.simple_cloud_config,
-        failure_expected: true,
-        dry_run: true,
-      )
+        output = deploy_from_scratch(
+          manifest_hash: manifest_hash,
+          cloud_config_hash: SharedSupport::DeploymentManifestHelper.simple_cloud_config,
+          failure_expected: true,
+          dry_run: true,
+        )
 
-      expect(output).to include <<~OUTPUT
-        Error: Unable to render instance groups for deployment. Errors are:
-          - Unable to render jobs for instance group 'foobar'. Errors are:
-            - Unable to render templates for job 'foobar_with_bad_properties'. Errors are:
-              - Error filling in template 'foobar_ctl' (line 8: Can't find property '["test_property"]')
-              - Error filling in template 'drain.erb' (line 4: Can't find property '["dynamic_drain_wait1"]')
-      OUTPUT
+        expect(output).to include <<~OUTPUT
+          Error: Unable to render instance groups for deployment. Errors are:
+            - Unable to render jobs for instance group 'foobar'. Errors are:
+              - Unable to render templates for job 'foobar_with_bad_properties'. Errors are:
+                - Error filling in template 'foobar_ctl' (line 8: Can't find property '["test_property"]')
+                - Error filling in template 'drain.erb' (line 4: Can't find property '["dynamic_drain_wait1"]')
+        OUTPUT
 
-      expect(director.vms.length).to eq(0)
+        expect(director.vms.length).to eq(0)
+      end
+    end
+
+    context 'when there are no errors' do
+      it 'returns some encouraging message but does not alter deployment' do
+        manifest_hash = SharedSupport::DeploymentManifestHelper.simple_manifest_with_instance_groups
+
+        deploy_from_scratch(
+          manifest_hash: manifest_hash,
+          cloud_config_hash: SharedSupport::DeploymentManifestHelper.simple_cloud_config,
+          dry_run: true,
+        )
+
+        expect(director.vms).to eq []
+      end
     end
   end
 
-  context 'when there are no errors' do
-    it 'returns some encouraging message but does not alter deployment' do
+  context 'when dry run precedes a real deployment' do
+    with_reset_sandbox_before_each
+
+    it 'does not interfere with a successful deployment later' do
       manifest_hash = SharedSupport::DeploymentManifestHelper.simple_manifest_with_instance_groups
 
       deploy_from_scratch(
@@ -48,25 +66,13 @@
         dry_run: true,
       )
 
-      expect(director.vms).to eq []
-    end
-  end
-
-  it 'does not interfere with a successful deployment later' do
-    manifest_hash = SharedSupport::DeploymentManifestHelper.simple_manifest_with_instance_groups
-
-    deploy_from_scratch(
-      manifest_hash: manifest_hash,
-      cloud_config_hash: SharedSupport::DeploymentManifestHelper.simple_cloud_config,
-      dry_run: true,
-    )
-
-    _, exit_code = deploy_from_scratch(
-      manifest_hash: manifest_hash,
-      cloud_config_hash: SharedSupport::DeploymentManifestHelper.simple_cloud_config,
-      return_exit_code: true,
-    )
+      _, exit_code = deploy_from_scratch(
+        manifest_hash: manifest_hash,
+        cloud_config_hash: SharedSupport::DeploymentManifestHelper.simple_cloud_config,
+        return_exit_code: true,
+      )
 
-    expect(exit_code).to eq(0)
+      expect(exit_code).to eq(0)
+    end
   end
 end

src/spec/integration/deploy/local_template_properties_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'local template properties', type: :integration do
-  with_reset_sandbox_before_each
+  with_reset_sandbox_before_all
 
   let(:manifest) do
     SharedSupport::DeploymentManifestHelper.manifest_with_release.merge(
@@ -41,7 +41,7 @@
     )
   end
 
-  before do
+  before(:all) do
     upload_cloud_config(cloud_config_hash: SharedSupport::DeploymentManifestHelper.simple_cloud_config)
     upload_stemcell
     create_and_upload_test_release

src/spec/integration/errand/run_errand_success_spec.rb

@@ -613,9 +613,9 @@
   end
 
   context 'when running an errand across multiple instances' do
-    with_reset_sandbox_before_each
+    with_reset_sandbox_before_all
 
-    let(:manifest_hash) do
+    before(:all) do
       errand_instance_spec = {
         'name' => 'errand-with-same-errand-and-multiple-instances',
         'jobs' => [
@@ -652,14 +652,11 @@
       }
 
       manifest = SharedSupport::DeploymentManifestHelper.manifest_with_errand_on_service_instance
+      manifest['name'] = 'errand'
       manifest['instance_groups'] << errand_instance_spec
       manifest['instance_groups'].first['instances'] = 4
 
-      manifest
-    end
-
-    before do
-      deploy_from_scratch(manifest_hash: manifest_hash)
+      deploy_from_scratch(manifest_hash: manifest)
     end
 
     it 'warns if errand is present across multiple instances' do

src/spec/integration/events_access_spec.rb

@@ -1,15 +1,14 @@
 require 'spec_helper'
 
 describe 'events endpoint access', type: :integration do
-  with_reset_sandbox_before_each(user_authentication: 'uaa')
+  with_reset_sandbox_before_all(user_authentication: 'uaa')
 
   director_client_env = {'BOSH_CLIENT' => 'director-access', 'BOSH_CLIENT_SECRET' => 'secret'}
   team_client_read_env = {'BOSH_CLIENT' => 'team-client-read-access', 'BOSH_CLIENT_SECRET' => 'team-secret'}
   team_client_admin_env = {'BOSH_CLIENT' => 'team-client', 'BOSH_CLIENT_SECRET' => 'team-secret'}
   no_access_client_env = {'BOSH_CLIENT' => 'no-access', 'BOSH_CLIENT_SECRET' => 'secret'}
 
-  before do
-
+  before(:all) do
     deployment_hash = SharedSupport::DeploymentManifestHelper.simple_manifest_with_instance_groups
     deployment_hash['instance_groups'][0]['instances'] = 1
 

src/spec/integration/links/link_parse_validation_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'Links', type: :integration do
-  with_reset_sandbox_before_each
+  with_reset_sandbox_before_all
 
   let(:cloud_config) do
     cloud_config_hash = SharedSupport::DeploymentManifestHelper.simple_cloud_config
@@ -23,10 +23,12 @@
     cloud_config_hash
   end
 
-  before do
+  before(:all) do
     upload_links_release(bosh_runner_options: {})
     upload_stemcell
+  end
 
+  before do
     upload_cloud_config(cloud_config_hash: cloud_config)
   end
 

src/spec/integration/links/network_resolution_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'network resolution', type: :integration do
-  with_reset_sandbox_before_each
+  with_reset_sandbox_before_all
 
   def should_contain_network_for_job(job, template, pattern)
     my_api_instance = director.instance(job, '0', deployment_name: 'simple')