Merge "Upgrade Drivetrain modifications."
diff --git a/jenkins/client/job/deploy/update/upgrade_mcp_release.yml b/jenkins/client/job/deploy/update/upgrade_mcp_release.yml
index 9f18006..c9b846f 100644
--- a/jenkins/client/job/deploy/update/upgrade_mcp_release.yml
+++ b/jenkins/client/job/deploy/update/upgrade_mcp_release.yml
@@ -29,11 +29,15 @@
default: ""
UPDATE_CLUSTER_MODEL:
type: boolean
- default: 'false'
+ default: 'true'
description: "Replace `apt_mk_version` parameter in cluster level Reclass model."
+ UPGRADE_SALTSTACK:
+ type: boolean
+ default: 'true'
+ description: "Upgrade SaltStack packages."
UPDATE_PIPELINES:
type: boolean
- default: 'false'
+ default: 'true'
description: "Mirror pipelines from upstream/local mirror to Gerrit."
UPDATE_LOCAL_REPOS:
type: boolean
diff --git a/linux/system/repo/mcp/apt_mirantis/saltstack.yml b/linux/system/repo/mcp/apt_mirantis/saltstack.yml
index 6fcd5a1..ec7d320 100644
--- a/linux/system/repo/mcp/apt_mirantis/saltstack.yml
+++ b/linux/system/repo/mcp/apt_mirantis/saltstack.yml
@@ -12,3 +12,7 @@
key_id: 0E08A149DE57BFBE
key_server: keyserver.ubuntu.com
clean_file: true
+ pin:
+ - pin: 'release o=SaltStack'
+ priority: 1100
+ package: '*'
\ No newline at end of file
diff --git a/linux/system/repo/mcp/apt_mirantis/saltstack_2016_3.yml b/linux/system/repo/mcp/apt_mirantis/saltstack_2016_3.yml
index 5d5e494..c0eabe3 100644
--- a/linux/system/repo/mcp/apt_mirantis/saltstack_2016_3.yml
+++ b/linux/system/repo/mcp/apt_mirantis/saltstack_2016_3.yml
@@ -3,6 +3,7 @@
parameters:
_param:
apt_mk_version: stable
+ salt_version: 2016.3
linux_system_repo_url: http://mirror.mirantis.com/${_param:apt_mk_version}/
linux_system_repo_mcp_saltstack_url: ${_param:linux_system_repo_url}/saltstack-2016.3/
linux:
@@ -12,3 +13,7 @@
source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_saltstack_url}/${_param:linux_system_codename}/ ${_param:linux_system_codename} main"
architectures: amd64
clean_file: true
+ pin:
+ - pin: 'release o=SaltStack'
+ priority: 1100
+ package: '*'