katello 3.3.0.rc1.1 → 3.3.0.rc2

data/lib/katello/tasks/clean_published_repo_directories.rake

@@ -0,0 +1,52 @@
+namespace :katello do
+  desc "Cleans up obsolete directories and estimates time to republish current directories. Run with COMMIT=true to republish."
+  task :clean_published_repo_directories => ['environment'] do
+    User.current = User.anonymous_admin
+    OLD_DIRECTORY = '/var/lib/pulp/published/yum/master'.freeze
+
+    current_cv_directories = []
+    Katello::ContentViewVersion.all.each do |cvv|
+      cvv.repositories.each { |repository| current_cv_directories << repository.pulp_id }
+    end
+
+    yum_distributor_directory = Dir.glob "#{OLD_DIRECTORY}/yum_distributor/*"
+    master_directory = Dir.glob "#{OLD_DIRECTORY}/*"
+    master_directory.delete "#{OLD_DIRECTORY}/yum_distributor"
+
+    republish = []
+    delete = []
+    master_directory.each do |directory|
+      repo_name = directory.split('/').last
+      (current_cv_directories.include?(repo_name) && yum_distributor_directory.exclude?(repo_name)) ? republish << repo_name : delete << directory
+    end
+
+    if republish.empty?
+      puts "There are no directories to republish."
+    elsif ENV['COMMIT'] == 'true'
+      republish.each do |directory|
+        puts "#{directory} is being published to #{OLD_DIRECTORY}/yum_distributor/#{directory}"
+        ForemanTasks.sync_task(::Actions::Katello::Repository::MetadataGenerate, Katello::Repository.where(pulp_id: "#{directory}").first)
+        delete << directory
+      end
+      puts "All relevant repositories have been republished."
+    else
+      min_time = republish.count * 1
+      max_time = republish.count * 5
+      if min_time < 60
+        puts "It will take approximately #{min_time} to #{max_time} minutes to finish republishing all relevant repositories"
+      else
+        puts "It will take approximately #{min_time / 60} to #{max_time / 60} hours to finish republishing all relevant repositories"
+      end
+      puts "The republishing these repositories will not actually be performed. Rerun with COMMIT=true to republish these repositories."
+    end
+
+    if delete.empty?
+      puts "There are no directories to delete."
+    else
+      open('/tmp/delete_repository_directories.sh', 'w') { |f| f << "rm -rf #{delete.join " \\\n "}" }
+      puts "To clean up the directories, please run the following as root:\n#bash /tmp/delete_repository_directories.sh"
+    end
+
+    puts "Rake task completed."
+  end
+end

data/lib/katello/tasks/reimport.rake

@@ -25,7 +25,8 @@ namespace :katello do
               Katello::Subscription,
               Katello::Pool,
               Katello::DockerManifest,
-              Katello::DockerTag]
+              Katello::DockerTag,
+              Katello::ContentViewPuppetEnvironment]
 
     models << Katello::OstreeBranch if Katello::RepositoryTypeManager.find(Katello::Repository::OSTREE_TYPE).present?
 

data/lib/katello/tasks/upgrades/2.4/import_puppet_modules.rake

@@ -5,6 +5,7 @@ namespace :katello do
         User.current = User.anonymous_api_admin
         puts _("Importing Puppet Modules")
         Katello::PuppetModule.import_all
+        Katello::ContentViewPuppetEnvironment.import_all
       end
     end
   end

data/lib/katello/tasks/upgrades/3.0/update_subscription_facet_backend_data.rake

@@ -38,7 +38,7 @@ namespace :katello do
           end
         end
 
-        Katello::Host::SubscriptionFacet.find_each do |subscription_facet|
+        Katello::Host::SubscriptionFacet.where.not(:uuid => nil).find_each do |subscription_facet|
           begin
             candlepin_attrs = subscription_facet.candlepin_consumer.consumer_attributes
             subscription_facet.import_database_attributes(candlepin_attrs)

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.3.0.rc1.1".freeze
+  VERSION = "3.3.0.rc2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.3.0.rc1.1
+  version: 3.3.0.rc2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -777,6 +777,7 @@ files:
 - app/lib/katello/resources/cdn.rb
 - app/lib/katello/util/cdn_var_substitutor.rb
 - app/lib/katello/util/data.rb
+- app/lib/katello/util/docker_manifest_clause_generator.rb
 - app/lib/katello/util/errata.rb
 - app/lib/katello/util/filter_clause_generator.rb
 - app/lib/katello/util/model.rb
@@ -847,6 +848,8 @@ files:
 - app/models/katello/content_facet_repository.rb
 - app/models/katello/content_view.rb
 - app/models/katello/content_view_component.rb
+- app/models/katello/content_view_docker_filter.rb
+- app/models/katello/content_view_docker_filter_rule.rb
 - app/models/katello/content_view_environment.rb
 - app/models/katello/content_view_erratum_filter.rb
 - app/models/katello/content_view_erratum_filter_rule.rb
@@ -1365,6 +1368,7 @@ files:
 - db/migrate/20160907231049_add_username_password_to_repository.rb
 - db/migrate/20160908234510_add_rpm_nvra.rb
 - db/migrate/20160923143611_add_action_to_content_view_histories.rb
+- db/migrate/20160924213020_change_katello_widget_names.rb
 - db/migrate/20160930121245_content_view_force_puppet_env.rb
 - db/migrate/20160930150810_add_smart_proxy_download_policy.rb
 - db/migrate/20161003130853_add_architecture_to_katello_content_view_package_filter_rule.rb
@@ -1374,6 +1378,8 @@ files:
 - db/migrate/20161026191118_fix_invalid_interfaces.rb
 - db/migrate/20161028153131_sub_facet_user_index_not_uniq.rb
 - db/migrate/20161031204903_add_tracer_support.rb
+- db/migrate/20161102194100_create_content_view_docker_filter_rules.rb
+- db/migrate/20161214151548_move_content_source_id_to_content_facets.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/103-provisioning_templates.rb
@@ -1490,7 +1496,6 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/views/content-view-deletion.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/views/version-deletion-activation-keys.html
-- engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/views/version-deletion-breadcrumb.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/views/version-deletion-confirm.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/views/version-deletion-content-hosts.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/views/version-deletion-environments.html
@@ -1529,7 +1534,6 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filters.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/new-filter.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/package-filter.controller.js
-- engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/package-group-filter.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/package-group-list-filter.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/rule.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/date-type-errata-filter.html
@@ -1556,6 +1560,7 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/views/content-view-puppet-module-names.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/views/content-view-puppet-module-versions.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/views/content-view-puppet-modules.html
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-copy.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-details-tasks.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-details.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-docker-repositories.html
@@ -1583,8 +1588,6 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-puppet-modules.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-yum.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version.html
-- engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/views/content-views-table-collapsed.html
-- engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/views/content-views-table-full.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/views/content-views.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-manifests/docker-manifest.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-manifests/docker-manifests.module.js
@@ -1885,6 +1888,7 @@ files:
 - lib/katello/repository_types/puppet.rb
 - lib/katello/repository_types/yum.rb
 - lib/katello/tasks/clean_backend_objects.rake
+- lib/katello/tasks/clean_published_repo_directories.rake
 - lib/katello/tasks/delete_orphaned_content.rake
 - lib/katello/tasks/gettext.rake
 - lib/katello/tasks/import_applicability.rake
@@ -2021,7 +2025,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: ''

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/views/version-deletion-breadcrumb.html

@@ -1,18 +0,0 @@
-<ul class="wizard">
-  <li ng-class="{active: isStep('environments')}">
-    <span translate>Lifecycle Environments</span>
-  </li>
-
-  <li ng-show="needHosts() && !isStep('environments')" ng-class="{active: isStep('contentHosts')}">
-    <span translate>Content Hosts</span>
-  </li>
-
-  <li ng-show="needActivationKeys() && !isStep('environments') && !isStep('contentHosts')"
-      ng-class="{active: isStep('activationKeys')}">
-    <span translate>Activation Keys</span>
-  </li>
-
-  <li ng-show="isStep('confirm')" ng-class="{active: isStep('confirm')}">
-    <span translate>Confirmation</span>
-  </li>
-</ul>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/package-group-filter.controller.js

@@ -1,16 +0,0 @@
-/**
- * @ngdoc object
- * @name  Bastion.content-views.controller:PackageGroupFilterController
- *
- * @requires $scope
- *
- * @description
- *   Provides common functionality on the $scope for PackageGroup filters.
- */
-angular.module('Bastion.content-views').controller('PackageGroupFilterController',
-    ['$scope', function ($scope) {
-
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-    }]
-);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/views/content-views-table-collapsed.html

@@ -1,21 +0,0 @@
-<table class="table table-striped" ng-class="{'table-mask': table.working}">
-
-  <thead>
-    <tr bst-table-head>
-      <th bst-table-column="name" sortable><span translate>Name</span></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <tr bst-table-row
-        ng-repeat="contentView in table.rows"
-        active-row="stateIncludes('content-views.details', {contentViewId: contentView.id})">
-      <td bst-table-cell>
-        <a ui-sref="content-views.details.versions({contentViewId: contentView.id})">
-          {{ contentView.name }}
-        </a>
-      </td>
-    </tr>
-  </tbody>
-
-</table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/views/content-views-table-full.html

@@ -1,46 +0,0 @@
-<table class="table table-striped table-bordered"
-       bst-table="table" 
-       ng-class="{'table-mask': table.working}"
-       ng-show="table.rows.length > 0">
-
-  <thead>
-    <tr bst-table-head>
-      <th bst-table-column><span translate>Name</span></th>
-      <th bst-table-column><span translate>Composite View?</span></th>
-      <th bst-table-column><span translate>Last Published</span></th>
-      <th bst-table-column><span translate>Environments</span></th>
-      <th bst-table-column><span translate>Repositories</span></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <tr bst-table-row ng-repeat="contentView in table.rows">
-      <td bst-table-cell>
-        <a ui-sref="content-views.details.versions({contentViewId: contentView.id})">
-          {{ contentView.name }}
-        </a>
-      </td>
-      <td bst-table-cell>
-        <span ng-show="contentView.composite" translate>Yes</span>
-        <span ng-hide="contentView.composite" translate>No</span>
-      </td>
-      <td bst-table-cell>
-        <span ng-show="contentView.last_published">{{ contentView.last_published | date:"medium" }}</span>
-        <span ng-hide="contentView.last_published" translate>
-          Not yet published
-        </span>
-      </td>
-      <td bst-table-cell>
-        <span ng-show="contentView.environments.length !== 0"
-              ng-repeat="environment in contentView.environments" ng-if="environment.permissions.readable">
-          {{ environment.name }}<span ng-if="!$last">, </span>
-        </span>
-        <span ng-show="contentView.environments.length === 0" translate>
-          Not yet published
-        </span>
-      </td>
-      <td bst-table-cell class="number-cell">{{ contentView.repositories.length }}</td>
-    </tr>
-  </tbody>
-
-</table>