debmirror updates
* Add :
- elasticsearch-6.x - include by default
- salt-formulas - include by default
- opencontrail-4.0
- opencontrail-4.1
* Update:
- ubuntu - update regex
- drop old 4.4.0 kernels
- elasticsearch-5.x|percona|extra - update regexp
Prod-related: PROD-26226 (PROD:26226)
Change-Id: Ic6a02d1c1d735794cc8ec94707b8f06a4f83c759
(cherry picked from commit a75ee02bfb0ae8fb5d2fbb2e414e0b836193067c)
diff --git a/debmirror/mirror_mirantis_com/elasticsearch-5.x/xenial.yml b/debmirror/mirror_mirantis_com/elasticsearch-5.x/xenial.yml
index 7fdb6d7..97d2cd3 100644
--- a/debmirror/mirror_mirantis_com/elasticsearch-5.x/xenial.yml
+++ b/debmirror/mirror_mirantis_com/elasticsearch-5.x/xenial.yml
@@ -17,5 +17,5 @@
dist: [ stable ]
section: [ main ]
filter:
- # drop all versions below 5.6.11
- 001: --exclude='(_|-)5\.([0-5]\.|6\.([0-9]|10)(-|\.))'
+ # drop all versions below 5.6.12
+ 001: --exclude='(_|-)5\.([0-5]\.|6\.([0-9]|10|11)(-|\.))'
diff --git a/debmirror/mirror_mirantis_com/elasticsearch-6.x/xenial.yml b/debmirror/mirror_mirantis_com/elasticsearch-6.x/xenial.yml
new file mode 100644
index 0000000..2c60c82
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/elasticsearch-6.x/xenial.yml
@@ -0,0 +1,22 @@
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_elasticsearch_6_x_xenial:
+ enabled: true
+ force: ${_param:mirror_mirantis_com_elasticsearch_6_x_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "rsync"
+ arch: [ 'amd64' ]
+ mirror_host: "mirror.mirantis.com"
+ mirror_root: ":mirror/${_param:mcp_version}/elasticsearch-6.x/xenial/"
+ target_dir: "${_param:debmirror_mirrors_base_target_dir}/elasticsearch-6.x/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_elasticsearch_6_x_xenial.log"
+ dist: [ stable ]
+ section: [ main ]
+ filter:
+# # drop all versions below 6.5.2
+ 001: --exclude='(_|-)6\.([0-4]\.|[0-5]\.[0-1])'
+
diff --git a/debmirror/mirror_mirantis_com/extra/xenial.yml b/debmirror/mirror_mirantis_com/extra/xenial.yml
index 9fec707..f5ed991 100644
--- a/debmirror/mirror_mirantis_com/extra/xenial.yml
+++ b/debmirror/mirror_mirantis_com/extra/xenial.yml
@@ -15,3 +15,5 @@
log_file: "/var/log/debmirror/mirror_mirantis_com_extra_xenial.log"
dist: [ xenial ]
section: [ main ]
+ filter:
+ 001: --exclude='(-|_)dbg(_|-)'
diff --git a/debmirror/mirror_mirantis_com/init.yml b/debmirror/mirror_mirantis_com/init.yml
index bf7858a..68f7530 100644
--- a/debmirror/mirror_mirantis_com/init.yml
+++ b/debmirror/mirror_mirantis_com/init.yml
@@ -3,6 +3,7 @@
- system.debmirror.mirror_mirantis_com.ceph-luminous.xenial
- system.debmirror.mirror_mirantis_com.docker.xenial
- system.debmirror.mirror_mirantis_com.elasticsearch-5.x.xenial
+- system.debmirror.mirror_mirantis_com.elasticsearch-6.x.xenial
- system.debmirror.mirror_mirantis_com.elasticsearch-curator-5.xenial
- system.debmirror.mirror_mirantis_com.extra.xenial
- system.debmirror.mirror_mirantis_com.glusterfs-3.8.xenial
@@ -10,6 +11,7 @@
- system.debmirror.mirror_mirantis_com.openstack-pike.xenial
- system.debmirror.mirror_mirantis_com.openstack-queens.xenial
- system.debmirror.mirror_mirantis_com.percona.xenial
+- system.debmirror.mirror_mirantis_com.salt-formulas.xenial
- system.debmirror.mirror_mirantis_com.saltstack-2017.7.xenial
- system.debmirror.mirror_mirantis_com.td-agent.xenial
- system.debmirror.mirror_mirantis_com.ubuntu.xenial
diff --git a/debmirror/mirror_mirantis_com/opencontrail-4.0/xenial.yml b/debmirror/mirror_mirantis_com/opencontrail-4.0/xenial.yml
new file mode 100644
index 0000000..38b13b1
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/opencontrail-4.0/xenial.yml
@@ -0,0 +1,19 @@
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_oc40_xenial:
+ force: ${_param:mirror_mirantis_com_oc40_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "rsync"
+ arch: [ 'amd64' ]
+ mirror_host: "mirror.mirantis.com"
+ mirror_root: ":mirror/${_param:mcp_version}/opencontrail-4.0/xenial/"
+ target_dir: "${_param:debmirror_mirrors_base_target_dir}/opencontrail-4.0/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_oc40_xenial.log"
+ dist: [ xenial ]
+ section: [ main ]
+ filter:
+ 001: "--exclude='(-dbg_|-dbg-)'"
diff --git a/debmirror/mirror_mirantis_com/opencontrail-4.1/xenial.yml b/debmirror/mirror_mirantis_com/opencontrail-4.1/xenial.yml
new file mode 100644
index 0000000..e7d6b2b
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/opencontrail-4.1/xenial.yml
@@ -0,0 +1,19 @@
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_oc41_xenial:
+ force: ${_param:mirror_mirantis_com_oc41_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "rsync"
+ arch: [ 'amd64' ]
+ mirror_host: "mirror.mirantis.com"
+ mirror_root: ":mirror/${_param:mcp_version}/opencontrail-4.1/xenial/"
+ target_dir: "${_param:debmirror_mirrors_base_target_dir}/opencontrail-4.1/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_oc41_xenial.log"
+ dist: [ xenial ]
+ section: [ main ]
+ filter:
+ 001: "--exclude='(-dbg_|-dbg-)'"
diff --git a/debmirror/mirror_mirantis_com/percona/xenial.yml b/debmirror/mirror_mirantis_com/percona/xenial.yml
index 1464dcc..87746e0 100644
--- a/debmirror/mirror_mirantis_com/percona/xenial.yml
+++ b/debmirror/mirror_mirantis_com/percona/xenial.yml
@@ -16,7 +16,7 @@
dist: [ xenial ]
section: [ main ]
filter:
- 001: "--exclude='(-dbg_|-dbg-)'"
+ 001: --exclude='(-|_)dbg(_|-)'
002: "--exclude='/percona-server-5.(5|6)'"
003: "--exclude='/percona-server-mongodb'"
004: "--exclude='/(percona-xtradb-cluster|percona-server-5|percona-xtradb-cluster)'"
diff --git a/debmirror/mirror_mirantis_com/salt-formulas/xenial.yml b/debmirror/mirror_mirantis_com/salt-formulas/xenial.yml
new file mode 100644
index 0000000..c7f8523
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/salt-formulas/xenial.yml
@@ -0,0 +1,17 @@
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_salt-formulas_xenial:
+ force: ${_param:mirror_mirantis_com_salt-formulas_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "rsync"
+ arch: [ 'amd64' ]
+ mirror_host: "mirror.mirantis.com"
+ mirror_root: ":mirror/${_param:mcp_version}/salt-formulas/xenial/"
+ target_dir: "${_param:debmirror_mirrors_base_target_dir}/salt-formulas/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_salt-formulas_xenial.log"
+ dist: [ xenial ]
+ section: [ main ]
diff --git a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
index 95806ad..30fbea5 100644
--- a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
+++ b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
@@ -16,6 +16,7 @@
log_file: "/var/log/debmirror/mirror_mirantis_com_ubuntu_xenial.log"
dist: [ xenial , xenial-security, xenial-updates ]
section: [ main , restricted, universe ]
+ cache_dir: "${_param:debmirror_mirrors_base_target_dir}/../.cache/ubuntu"
# Don't exclude main/x11 - its required for many pkgs.
exclude_deb_section:
- Xfce
@@ -132,8 +133,10 @@
306: '--exclude="main/l/linux.*/linux-.*4\.10\.0-(([0-3][0-9])|(4[0-1]))"'
# Hwe 4.13: Old - if minor in 0-39, < 44
307: '--exclude="main/l/linux.*/linux-.*4\.13\.0-(([0-3][0-9])|(4[0-4]))"'
- # Hwe 4.15: Old - if minor in 0-19, < 34
- 308: '--exclude="main/l/linux.*/linux-.*4\.15\.0-(([0-1][0-9])|([0-3][0-3]))"'
+ # Hwe 4.15.0: Old - if minor in 0-39, < 43
+ 308: --exclude='main/l/linux.*/linux-.*4\.15\.0-(([0-3][0-9])|(4[0-2]))'
+ # Old 4.4.0
+ 309: --exclude='main/l/linux.*/linux-.*4\.4\.0-'
# List of packages, that should be fetched from fresh ppa or other mirror
# So,removing them from upstream mirror.
500: "--exclude='/main/m/maas/'"