Backport updates for repo management state

Change-Id: Id227b22670efb211c15645a3e2b95fb215fef91a
Related-Prod: #PROD-28395 (PROD:28395)
diff --git a/tests/pillar/system.sls b/tests/pillar/system.sls
index eb6201e..5bb19a1 100644
--- a/tests/pillar/system.sls
+++ b/tests/pillar/system.sls
@@ -124,7 +124,40 @@
     package:
       htop:
         version: latest
+    apt:
+      preferences:
+        enabled: true
+        rules:
+          100:
+            enabled: true
+            name: 'Ubuntu origin'
+            pin: 'release o=Ubuntu'
+            priority: 1100
+            package: '*'
+          5:
+            enabled: true
+            name: 'Ubuntu origin'
+            pin: 'release o=Ubuntu'
+            priority: 1100
+            package: '*'
     repo:
+      saltstack:
+        source: "deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/ xenial main"
+        key_url: "http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/SALTSTACK-GPG-KEY.pub"
+        name: 'human readable saltstack reponame'
+        architectures: amd64
+        clean_file: true
+        pinning:
+          10:
+            enabled: true
+            pin: 'release o=SaltStack'
+            priority: 50
+            package: 'libsodium18'
+          20:
+            enabled: true
+            pin: 'release o=SaltStack'
+            priority: 1100
+            package: '*'
       opencontrail:
         source: "deb http://ppa.launchpad.net/tcpcloud/contrail-3.0/ubuntu xenial main"
         keyid: E79EE90C