Add ros-apt-proxy repo

boxcutter · Jan 11, 2025 · 15af79d · 15af79d
1 parent adcec60
commit 15af79d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/cookbooks/boxcutter_backhaul/recipes/default.rb b/cookbooks/boxcutter_backhaul/recipes/default.rb
@@ -78,7 +78,18 @@
       'bucket_name' => 'boxcutter-acceptance-blobstore-sandbox-uswest2',
     },
   }
-  node.default['boxcutter_sonatype']['nexus_repository']['repositories'] = {}
+  # storage_blob_store_name
+  node.default['boxcutter_sonatype']['nexus_repository']['repositories'] = {
+    'ros-apt-proxy' => {
+      'name' => 'ros-apt-proxy',
+      'type' => 'proxy',
+      'format' => 'apt',
+      'remote_url' => 'http://packages.ros.org/ros2/ubuntu',
+      'distribution' => 'jammy',
+      'flat' => false,
+      'storage_blob_store_name' => 's3-blob-store',
+    },
+  }
   # node.default['boxcutter_sonatype']['nexus_repository']['repositories'] = {
   #   'ros-apt-proxy' => {
   #     'name' => 'ros-apt-proxy',

diff --git a/cookbooks/boxcutter_sonatype/libraries/default.rb b/cookbooks/boxcutter_sonatype/libraries/default.rb
@@ -129,7 +129,7 @@ def self.repository_create_apt_payload(repository_name, repository_config)
             'name' => repository_name,
             'online' => true,
             'storage' => {
-              'blobStoreName' => 'default',
+              'blobStoreName' => repository_config.fetch('storage_blob_store_name', 'default'),
               'strictContentTypeValidation' => false,
             },
             'cleanup' => {
@@ -183,7 +183,7 @@ def self.repository_create_docker_payload(repository_name, repository_config)
             'name' => repository_name,
             'online' => true,
             'storage' => {
-              'blobStoreName' => 'default',
+              'blobStoreName' => repository_config.fetch('storage_blob_store_name', 'default'),
               'strictContentTypeValidation' => true,
             },
             'group' => {
@@ -202,7 +202,7 @@ def self.repository_create_docker_payload(repository_name, repository_config)
             'name' => repository_name,
             'online' => true,
             'storage' => {
-              'blobStoreName' => 'default',
+              'blobStoreName' => repository_config.fetch('storage_blob_store_name', 'default'),
               'strictContentTypeValidation' => true,
               'writePolicy' => 'allow',
               'latestPolicy' => true,
@@ -222,7 +222,7 @@ def self.repository_create_docker_payload(repository_name, repository_config)
             'name' => repository_name,
             'online' => true,
             'storage' => {
-              'blobStoreName' => 'default',
+              'blobStoreName' => repository_config.fetch('storage_blob_store_name', 'default'),
               'strictContentTypeValidation' => true,
             },
             'cleanup' => {
@@ -272,7 +272,7 @@ def self.repository_create_raw_payload(repository_name, repository_config)
             'name' => repository_name,
             'online' => true,
             'storage' => {
-              'blobStoreName' => 'default',
+              'blobStoreName' => repository_config.fetch('storage_blob_store_name', 'default'),
               'strictContentTypeValidation' => true,
               'writePolicy' => 'allow',
             },
@@ -285,7 +285,7 @@ def self.repository_create_raw_payload(repository_name, repository_config)
             'name' => repository_name,
             'online' => true,
             'storage' => {
-              'blobStoreName' => 'default',
+              'blobStoreName' => repository_config.fetch('storage_blob_store_name', 'default'),
               'strictContentTypeValidation' => false,
             },
             'proxy' => {