webpack/redux/actions/RedHatRepositories/helpers.js in katello-3.11.2 vs webpack/redux/actions/RedHatRepositories/helpers.js in katello-3.12.0.rc1
- old
+ new
@@ -1,33 +1,36 @@
import { first, intersection } from 'lodash';
const repoTypeSearchQueryMap = {
- rpm: '(name !~ source rpm) and (name !~ debug rpm) and (content_type = yum) and (name !~ beta) and (product_name !~ beta)',
+ rpm: '(name !~ source rpm) and (name !~ debug rpm) and (content_type = yum) and (label !~ beta) and (label !~ htb) and (name !~ beta) and (product_name !~ beta)',
sourceRpm: '(name ~ source rpm) and (content_type = yum)',
debugRpm: '(name ~ debug rpm) and (content_type = yum)',
kickstart: 'content_type = kickstart',
ostree: 'content_type = ostree',
- beta: 'name ~ beta',
+ beta: '(name ~ beta) or (label ~ beta) or (label ~ htb)',
};
const recommendedRepositoriesRHEL = [
'rhel-7-server-rpms',
'rhel-7-server-optional-rpms',
'rhel-7-server-extras-rpms',
'rhel-7-server-eus-rpms',
+ 'rhel-7-server-kickstart',
'rhel-6-server-rpms',
+ 'rhel-6-server-kickstart',
'rhel-5-server-els-rpms',
];
const recommendedRepositoriesSatTools = [
- 'rhel-7-server-satellite-tools-6.4-rpms',
- 'rhel-6-server-satellite-tools-6.4-rpms',
- 'rhel-5-server-els-satellite-tools-6.4-rpms',
+ 'rhel-7-server-satellite-tools-6.5-rpms',
+ 'rhel-6-server-satellite-tools-6.5-rpms',
+ 'rhel-5-server-els-satellite-tools-6.5-rpms',
+ 'rhel-7-server-satellite-maintenance-6-rpms',
];
const recommendedRepositoriesMisc = [
'rhel-server-rhscl-7-rpms',
- 'rhel-7-server-satellite-capsule-6.4-rpms',
+ 'rhel-7-server-satellite-capsule-6.5-rpms',
'rhel-7-server-ansible-2.6-rpms',
];
const recommendedRepositorySetLables = recommendedRepositoriesRHEL
.concat(recommendedRepositoriesSatTools)