Merge "Revert "Set default SALT_VERSION: 2017.7 for test-salt-formula-{{name}}-latest""diff --git a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
index 7cc4ba2..e8ef745 100644
--- a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
+++ b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
@@ -22,69 +22,57 @@
section: [ main , restricted, universe ]
# Don't exclude main/x11 - its required for many pkgs.
exclude_deb_section:
+ - Xfce
+ - comm
+ - doc
+ - electronics
- games
- gnome
- - Xfce
- - sound
- - electronics
- graphics
- hamradio
- - doc
- - localization
- kde
- - video
- - translations
+ - localization
- news
- - multiverse/games
- - multiverse/gnome
- - multiverse/Xfce
- - multiverse/sound
- - multiverse/electronics
- - multiverse/graphics
- - multiverse/hamradio
- - multiverse/doc
- - multiverse/localization
- - multiverse/kde
- - multiverse/video
- - multiverse/translations
- - multiverse/news
- - multiverse/x11
- - universe/games
- - universe/gnome
- - universe/Xfce
- - universe/sound
- - universe/electronics
- - universe/hamradio
- - universe/doc
- - universe/localization
- - universe/kde
- - universe/video
- - universe/translations
- - universe/news
- - universe/x11
- - universe/graphics
+ - science
+ - sound
+ - translations
+ - video
+ - main/debug
+ - main/science
+ - restricted/Xfce
+ - restricted/comm
+ - restricted/debug
+ - restricted/doc
+ - restricted/electronics
- restricted/games
- restricted/gnome
- - restricted/Xfce
- - restricted/sound
- - restricted/electronics
- restricted/graphics
- restricted/hamradio
- - restricted/doc
- - restricted/localization
- restricted/kde
- - restricted/video
- - restricted/translations
+ - restricted/localization
- restricted/news
+ - restricted/science
+ - restricted/sound
+ - restricted/translations
+ - restricted/video
- restricted/x11
- - main/debug
- - multiverse/debug
- - restricted/debug
- - universe/debug
- - comm
- - multiverse/comm
+ - universe/Xfce
- universe/comm
- - restricted/comm
+ - universe/debug
+ - universe/doc
+ - universe/electronics
+ - universe/games
+ - universe/gnome
+ - universe/graphics
+ - universe/hamradio
+ - universe/kde
+ - universe/localization
+ - universe/news
+ - universe/science
+ - universe/sound
+ - universe/translations
+ - universe/video
+ - universe/x11
# Updating filter, please always start from section, aka main|universe|multiverse
filter:
1: "--exclude='android*'"
@@ -134,15 +122,20 @@
97: "--exclude='/universe/.*(metastudent).*'"
# List of unused linux kernels and unsupported arch
300: "--exclude='/.*(arm64|powerpc|s390x|armel|armhf|sparc64|mips64|ppc64el|mipsn32)(?!.*amd64)'"
- 301: "--exclude='(main|universe)/l/linux-*-(.*azure|.*aws|gke|.*azure-edge|.*oem/|.*euclid/)'"
+ 301: "--exclude='(main|universe)/l/linux-*-(.*azure|.*aws|gke|gcp|.*azure-edge|.*oem/|.*euclid/)'"
302: "--exclude='/*universe.*(-armel-|-arm-)(?!.*amd64)'"
303: "--exclude='/main/l/linux(.*)/linux-source-*'"
- # Generic: Old minor version of kernels. Old - if minor less then 3 digits.
- 304: '--exclude="main/l/(linux|linux-signed)/linux-.*.4\.4\.0-[0-9]{1,2}\."'
- # Hwe 4.8: Old minor version of kernels. Old - if minor in 30-40.
- 305: '--exclude="main/l/.*hwe.*/linux-.*.4\.8\.0-((3|4)[0-9])"'
- # Hwe 4.10: Old minor version of kernels. Old - if minor in 20-30.
- 306: '--exclude="main/l/.*hwe.*/linux-.*.4\.10\.0-((2|3)[0-9])"'
+ # Old minor version of kernel|tools|extra|cloud and related.
+ # Generic: Old - if minor less then < 127, but not 4numeric
+ 304: '--exclude="main/l/linux.*/linux-.*4\.4\.0-(([0-9][0-9])|([0-9][0-2][0-6]))(\.|_|-)"'
+ # Hwe 4.8: Old - if minor in 30-49 and < 57.
+ 305: '--exclude="main/l/linux.*/linux-.*4\.8\.0-(([0-4][0-9])|([0-9][0-6]))"'
+ # Hwe 4.10: Old - if minor in 0-39, < 42 .
+ 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, < 24
+ 308: '--exclude="main/l/linux.*/linux-.*4\.15\.0-(([0-1][0-9])|([0-2][0-3]))"'
# List of packages, that should be fetched from fresh ppa or other mirror
# So,removing them from upstream mirror.
500: "--exclude='/main/m/maas/'"
diff --git a/jenkins/client/job/oscore/salt_virtual_models.yml b/jenkins/client/job/oscore/salt_virtual_models.yml
index 4377a7f..f315b3d 100644
--- a/jenkins/client/job/oscore/salt_virtual_models.yml
+++ b/jenkins/client/job/oscore/salt_virtual_models.yml
@@ -35,6 +35,10 @@
type: string
description: "Heat stack zone where build stack"
default: "mcp-oscore-ci"
+ HEAT_STACK_ENVIRONMENT:
+ type: string
+ description: "Heat stack env parameters for deployment"
+ default: "devcloud"
STACK_RECLASS_ADDRESS:
type: string
default: 'https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab'
diff --git a/salt/control/cluster/kubernetes_control_cluster.yml b/salt/control/cluster/kubernetes_control_cluster.yml
new file mode 100644
index 0000000..c3049ec
--- /dev/null
+++ b/salt/control/cluster/kubernetes_control_cluster.yml
@@ -0,0 +1,29 @@
+parameters:
+ salt:
+ control:
+ size:
+ kubernetes.control:
+ cpu: 4
+ ram: 8192
+ disk_profile: small
+ net_profile: default
+ cluster:
+ internal:
+ domain: ${_param:cluster_domain}
+ engine: virt
+ node:
+ ctl01:
+ name: ${_param:kubernetes_control_node01_hostname}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: kubernetes.control
+ ctl02:
+ name: ${_param:kubernetes_control_node02_hostname}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: kubernetes.control
+ ctl03:
+ name: ${_param:kubernetes_control_node03_hostname}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: kubernetes.control
diff --git a/salt/control/cluster/kubernetes_proxy_cluster.yml b/salt/control/cluster/kubernetes_proxy_cluster.yml
index d4251a2..379a333 100644
--- a/salt/control/cluster/kubernetes_proxy_cluster.yml
+++ b/salt/control/cluster/kubernetes_proxy_cluster.yml
@@ -3,8 +3,8 @@
control:
size:
kubernetes.proxy:
- cpu: 32
- ram: 65536
+ cpu: 2
+ ram: 4096
disk_profile: small
net_profile: default
cluster:
@@ -15,11 +15,11 @@
prx01:
name: ${_param:kubernetes_proxy_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
- image: ${_param:salt_control_trusty_image}
+ image: ${_param:salt_control_xenial_image}
size: kubernetes.proxy
prx02:
name: ${_param:kubernetes_proxy_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
- image: ${_param:salt_control_trusty_image}
+ image: ${_param:salt_control_xenial_image}
size: kubernetes.proxy