commit e02a1b25698f0dbcd8276c6df49be6f6bb7a4724
author Denis Egorenko <degorenko@mirantis.com> Fri Oct 19 17:47:53 2018 +0400
committer Denis Egorenko <degorenko@mirantis.com> Tue Oct 23 12:20:52 2018 +0400
tree c16ba9840431f5a510c6e91e22fed188112999d4
parent 2da0d9c05fd34a1d2b64d4692929c084964814e3

Implement pinning options for extra repo as map object for Docker tests

Change-Id: I8a8ff7f6b8201b5b8e5c5580d52c653e7bada9c6

src/com/mirantis/mk/SaltModelTesting.groovy

diff --git a/src/com/mirantis/mk/SaltModelTesting.groovy b/src/com/mirantis/mk/SaltModelTesting.groovy
index 7f298f2..3e40b0f 100644
--- a/src/com/mirantis/mk/SaltModelTesting.groovy
+++ b/src/com/mirantis/mk/SaltModelTesting.groovy
@@ -70,14 +70,13 @@
 repo:
   mcp_saltstack:
     source: "deb [arch=amd64] http://mirror.mirantis.com/${distribRevision}/saltstack-2017.7/xenial xenial main"
-    pinning: |-
-        Package: libsodium18
-        Pin: release o=SaltStack
-        Pin-Priority: 50
-
-        Package: *
-        Pin: release o=SaltStack
-        Pin-Priority: 1100
+    pin:
+      - package: "libsodium18"
+        pin: "release o=SaltStack"
+        priority: 50
+      - package: "*"
+        pin: "release o=SaltStack"
+        priority: "1100"
   mcp_extra:
     source: "${extraRepoSource}"
   mcp_saltformulas:
@@ -109,6 +108,7 @@
                             echo "Installing extra-deb dependencies inside docker:"
                             echo > /etc/apt/sources.list
                             rm -vf /etc/apt/sources.list.d/* || true
+                            rm -vf /etc/apt/preferences.d/* || true
                         """)
                         common.debianExtraRepos(extraReposYaml)
                         sh('''#!/bin/bash -xe