cloudfoundry · jpalermo · Oct 11, 2024 · Oct 10, 2024
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -10,7 +10,6 @@ jobs:
         - common:parallel
         - core:parallel
         - dev:parallel
-        - director-core:parallel
         - monitor:parallel
         - nats-sync:parallel
         - template:parallel

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
@@ -9,7 +9,6 @@ groups:
       - unit-common
       - unit-core
       - unit-dev
-      - unit-director-core
       - unit-monitor
       - unit-nats-sync
       - unit-template
@@ -61,7 +60,6 @@ jobs:
       - unit-common
       - unit-core
       - unit-dev
-      - unit-director-core
       - unit-monitor
       - unit-nats-sync
       - unit-template
@@ -127,23 +125,6 @@ jobs:
       params:
         RAKE_TASK: spec:unit:dev
 
-  - name: unit-director-core
-    public: true
-    serial: true
-    serial_groups: [unit-director-core]
-    build_logs_to_retain: 250
-    plan:
-    - get: bosh-src
-      trigger: true
-      passed: [gate]
-    - get: integration-image
-    - task: test-rake-task
-      timeout: 2h
-      file: bosh-src/ci/tasks/test-rake-task.yml
-      image: integration-image
-      params:
-        RAKE_TASK: spec:unit:director-core
-
   - name: unit-monitor
     public: true
     serial: true
@@ -423,7 +404,6 @@ jobs:
       - unit-common
       - unit-core
       - unit-dev
-      - unit-director-core
       - unit-monitor
       - unit-nats-sync
       - unit-template

diff --git a/packages/director/spec b/packages/director/spec
@@ -10,7 +10,6 @@ files:
 - bosh-director/**/*
 - bosh_common/**/*
 - bosh-core/**/*
-- bosh-director-core/**/*
 - bosh-template/**/*
 - vendor/cache/*.gem
 - vendor/cache/extensions/**
diff --git a/scripts/rsync-bbl b/scripts/rsync-bbl
@@ -39,7 +39,6 @@ main() {
   do-rsync bosh-director db
   do-rsync bosh-director lib
   do-rsync bosh-core lib
-  do-rsync bosh-director-core lib
   do-rsync bosh-template bin
   do-rsync bosh-template lib
 

diff --git a/scripts/rsync-vbox b/scripts/rsync-vbox
@@ -29,7 +29,6 @@ main() {
   do-rsync bosh-director db director
   do-rsync bosh-director lib director
   do-rsync bosh-core lib director
-  do-rsync bosh-director-core lib director
   do-rsync bosh-template bin director
   do-rsync bosh-template lib director
   do-rsync bosh-monitor lib health_monitor

diff --git a/src/Gemfile b/src/Gemfile
@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 
 gem 'bosh-core', path: 'bosh-core'
 gem 'bosh-director', path: 'bosh-director'
-gem 'bosh-director-core', path: 'bosh-director-core'
 gem 'bosh-monitor', path: 'bosh-monitor'
 gem 'bosh-nats-sync', path: 'bosh-nats-sync'
 gem 'bosh-template', path: 'bosh-template'

diff --git a/src/Gemfile.lock b/src/Gemfile.lock
@@ -16,22 +16,12 @@ PATH
       logging
       openssl
 
-PATH
-  remote: bosh-director-core
-  specs:
-    bosh-director-core (0.0.0)
-      bosh-template (~> 0.0.0)
-      bosh_common (~> 0.0.0)
-      openssl
-      securerandom
-
 PATH
   remote: bosh-director
   specs:
     bosh-director (0.0.0)
       bcrypt
       bosh-core (~> 0.0.0)
-      bosh-director-core (~> 0.0.0)
       bosh-template (~> 0.0.0)
       bosh_common (~> 0.0.0)
       bosh_cpi
@@ -368,7 +358,6 @@ DEPENDENCIES
   bosh-core!
   bosh-dev!
   bosh-director!
-  bosh-director-core!
   bosh-monitor!
   bosh-nats-sync!
   bosh-template!

diff --git a/src/bosh-director-core/.gitignore b/src/bosh-director-core/.gitignore
diff --git a/src/bosh-director-core/bosh-director-core.gemspec b/src/bosh-director-core/bosh-director-core.gemspec
diff --git a/src/bosh-director-core/spec/gemspec_spec.rb b/src/bosh-director-core/spec/gemspec_spec.rb
diff --git a/src/bosh-director-core/spec/spec_helper.rb b/src/bosh-director-core/spec/spec_helper.rb
diff --git a/src/bosh-director/bosh-director.gemspec b/src/bosh-director/bosh-director.gemspec
@@ -35,10 +35,9 @@ Gem::Specification.new do |spec|
   # external CPIs, in order to ensure appropriate versions are installed.
   # Also do the same in bosh_cli_plugin_micro.gemspec
   # Review this once CPIs are completely externalized and "micro" goes away.
-  spec.add_dependency 'bosh_common',        "~>#{Bosh::Director::VERSION}"
-  spec.add_dependency 'bosh-core',          "~>#{Bosh::Director::VERSION}"
-  spec.add_dependency 'bosh-director-core', "~>#{Bosh::Director::VERSION}"
-  spec.add_dependency 'bosh-template',      "~>#{Bosh::Director::VERSION}"
+  spec.add_dependency 'bosh_common',   "~>#{Bosh::Director::VERSION}"
+  spec.add_dependency 'bosh-core',     "~>#{Bosh::Director::VERSION}"
+  spec.add_dependency 'bosh-template', "~>#{Bosh::Director::VERSION}"
 
   spec.add_dependency 'bcrypt'
   spec.add_dependency 'bosh_cpi'

diff --git a/...h-director-core/lib/bosh/director/core.rb → src/bosh-director/lib/bosh/director/core.rb b/...h-director-core/lib/bosh/director/core.rb → src/bosh-director/lib/bosh/director/core.rb
diff --git a/...ore/lib/bosh/director/core/tar_gzipper.rb → ...tor/lib/bosh/director/core/tar_gzipper.rb b/...ore/lib/bosh/director/core/tar_gzipper.rb → ...tor/lib/bosh/director/core/tar_gzipper.rb
diff --git a/...-core/lib/bosh/director/core/templates.rb → ...ector/lib/bosh/director/core/templates.rb b/...-core/lib/bosh/director/core/templates.rb → ...ector/lib/bosh/director/core/templates.rb
diff --git a/...ates/compressed_rendered_job_templates.rb → ...ates/compressed_rendered_job_templates.rb b/...ates/compressed_rendered_job_templates.rb → ...ates/compressed_rendered_job_templates.rb
diff --git a/...r/core/templates/job_instance_renderer.rb → ...r/core/templates/job_instance_renderer.rb b/...r/core/templates/job_instance_renderer.rb → ...r/core/templates/job_instance_renderer.rb
diff --git a/...tor/core/templates/job_template_loader.rb → ...tor/core/templates/job_template_loader.rb b/...tor/core/templates/job_template_loader.rb → ...tor/core/templates/job_template_loader.rb
diff --git a/...r/core/templates/job_template_renderer.rb → ...r/core/templates/job_template_renderer.rb b/...r/core/templates/job_template_renderer.rb → ...r/core/templates/job_template_renderer.rb
diff --git a/.../core/templates/rendered_file_template.rb → .../core/templates/rendered_file_template.rb b/.../core/templates/rendered_file_template.rb → .../core/templates/rendered_file_template.rb
diff --git a/...r/core/templates/rendered_job_instance.rb → ...r/core/templates/rendered_job_instance.rb b/...r/core/templates/rendered_job_instance.rb → ...r/core/templates/rendered_job_instance.rb
diff --git a/...r/core/templates/rendered_job_template.rb → ...r/core/templates/rendered_job_template.rb b/...r/core/templates/rendered_job_template.rb → ...r/core/templates/rendered_job_template.rb
diff --git a/...e/templates/rendered_templates_archive.rb → ...e/templates/rendered_templates_archive.rb b/...e/templates/rendered_templates_archive.rb → ...e/templates/rendered_templates_archive.rb
diff --git a/...ndered_templates_in_memory_tar_gzipper.rb → ...ndered_templates_in_memory_tar_gzipper.rb b/...ndered_templates_in_memory_tar_gzipper.rb → ...ndered_templates_in_memory_tar_gzipper.rb
diff --git a/...re/templates/rendered_templates_writer.rb → ...re/templates/rendered_templates_writer.rb b/...re/templates/rendered_templates_writer.rb → ...re/templates/rendered_templates_writer.rb
diff --git a/...osh/director/core/templates/source_erb.rb → ...osh/director/core/templates/source_erb.rb b/...osh/director/core/templates/source_erb.rb → ...osh/director/core/templates/source_erb.rb
diff --git a/...tor/core/templates/template_blob_cache.rb → ...tor/core/templates/template_blob_cache.rb b/...tor/core/templates/template_blob_cache.rb → ...tor/core/templates/template_blob_cache.rb
diff --git a/...or-core/lib/bosh/director/core/version.rb → ...irector/lib/bosh/director/core/version.rb b/...or-core/lib/bosh/director/core/version.rb → ...irector/lib/bosh/director/core/version.rb
diff --git a/...ec/bosh/director/core/tar_gzipper_spec.rb → ...rector/spec/unit/core/tar_gzipper_spec.rb b/...ec/bosh/director/core/tar_gzipper_spec.rb → ...rector/spec/unit/core/tar_gzipper_spec.rb
diff --git a/...compressed_rendered_job_templates_spec.rb → ...compressed_rendered_job_templates_spec.rb b/...compressed_rendered_job_templates_spec.rb → ...compressed_rendered_job_templates_spec.rb
diff --git a/...e/templates/job_instance_renderer_spec.rb → ...e/templates/job_instance_renderer_spec.rb b/...e/templates/job_instance_renderer_spec.rb → ...e/templates/job_instance_renderer_spec.rb
diff --git a/...ore/templates/job_template_loader_spec.rb → ...ore/templates/job_template_loader_spec.rb b/...ore/templates/job_template_loader_spec.rb → ...ore/templates/job_template_loader_spec.rb
diff --git a/...e/templates/job_template_renderer_spec.rb → ...e/templates/job_template_renderer_spec.rb b/...e/templates/job_template_renderer_spec.rb → ...e/templates/job_template_renderer_spec.rb
diff --git a/...e/templates/rendered_job_instance_spec.rb → ...e/templates/rendered_job_instance_spec.rb b/...e/templates/rendered_job_instance_spec.rb → ...e/templates/rendered_job_instance_spec.rb
diff --git a/...e/templates/rendered_job_template_spec.rb → ...e/templates/rendered_job_template_spec.rb b/...e/templates/rendered_job_template_spec.rb → ...e/templates/rendered_job_template_spec.rb
diff --git a/...plates/rendered_templates_archive_spec.rb → ...plates/rendered_templates_archive_spec.rb b/...plates/rendered_templates_archive_spec.rb → ...plates/rendered_templates_archive_spec.rb
diff --git a/...d_templates_in_memory_tar_gzipper_spec.rb → ...d_templates_in_memory_tar_gzipper_spec.rb b/...d_templates_in_memory_tar_gzipper_spec.rb → ...d_templates_in_memory_tar_gzipper_spec.rb
diff --git a/...mplates/rendered_templates_writer_spec.rb → ...mplates/rendered_templates_writer_spec.rb b/...mplates/rendered_templates_writer_spec.rb → ...mplates/rendered_templates_writer_spec.rb
diff --git a/...irector/core/templates/source_erb_spec.rb → ...ec/unit/core/templates/source_erb_spec.rb b/...irector/core/templates/source_erb_spec.rb → ...ec/unit/core/templates/source_erb_spec.rb
diff --git a/...ore/templates/template_blob_cache_spec.rb → ...ore/templates/template_blob_cache_spec.rb b/...ore/templates/template_blob_cache_spec.rb → ...ore/templates/template_blob_cache_spec.rb