Fix pillar tests
* Update run_tests.sh to the latest revision
* drop odd .kitchen.vagrant.yml
Related-Bug: PROD-20730 (PROD:20730)
Change-Id: I367800a60ad17020700a76670d1216dfdfcfe692
diff --git a/tests/pillar/network_openvswitch.sls b/tests/pillar/network_openvswitch.sls
index 56aa92d..80c482a 100644
--- a/tests/pillar/network_openvswitch.sls
+++ b/tests/pillar/network_openvswitch.sls
@@ -2,6 +2,7 @@
system:
enabled: true
domain: local
+ name: linux
network:
enabled: true
hostname: test01
diff --git a/tests/pillar/network_openvswitch_dpdk.sls b/tests/pillar/network_openvswitch_dpdk.sls
index be8ed98..2e85df7 100644
--- a/tests/pillar/network_openvswitch_dpdk.sls
+++ b/tests/pillar/network_openvswitch_dpdk.sls
@@ -2,6 +2,7 @@
system:
enabled: true
domain: local
+ name: linux
network:
enabled: true
hostname: test01
diff --git a/tests/pillar/storage.sls b/tests/pillar/storage.sls
index 0a92f91..2e9a7fc 100644
--- a/tests/pillar/storage.sls
+++ b/tests/pillar/storage.sls
@@ -1,4 +1,12 @@
linux:
+ system:
+ enabled: true
+ name: linux
+ domain: local
+ network:
+ enabled: true
+ hostname: linux
+ fqdn: linux.ci.local
storage:
enabled: true
swap:
diff --git a/tests/pillar/system.sls b/tests/pillar/system.sls
index aad46ef..f032df0 100644
--- a/tests/pillar/system.sls
+++ b/tests/pillar/system.sls
@@ -147,9 +147,10 @@
enabled: true
https: https://127.0.5.1:443
#http: http://127.0.5.2:8080
- apt-mk-salt:
- source: "deb http://apt-mk.mirantis.com/xenial stable salt"
- #key_url: http://apt-mk.mirantis.com/public.gpg
+ apt-salt:
+ source: "deb http://apt.mirantis.com/xenial stable salt"
+ #key_url: http://apt.mirantis.com/public.gpg
+ # pub 4096R/A76882D3 2015-06-17
key: |
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1
@@ -206,15 +207,15 @@
architectures: amd64
proxy:
enabled: true
- apt-mk-salt-nightly:
- source: "deb http://apt-mk.mirantis.com/xenial nightly salt"
- key_url: http://apt-mk.mirantis.com/public.gpg
+ apt-salt-nightly:
+ source: "deb http://apt.mirantis.com/xenial nightly salt"
+ key_url: http://apt.mirantis.com/public.gpg
architectures: amd64
proxy:
enabled: false
- apt-mk-extra-nightly:
- source: "deb http://apt-mk.mirantis.com/xenial nightly extra"
- key_url: http://apt-mk.mirantis.com/public.gpg
+ apt-extra-nightly:
+ source: "deb http://apt.mirantis.com/xenial nightly extra"
+ key_url: http://apt.mirantis.com/public.gpg
architectures: amd64
locale:
en_US:
diff --git a/tests/pillar/system_banner.sls b/tests/pillar/system_banner.sls
index 6c9ca6a..87042a7 100644
--- a/tests/pillar/system_banner.sls
+++ b/tests/pillar/system_banner.sls
@@ -1,6 +1,11 @@
linux:
+ network:
+ enabled: true
+ hostname: linux
+ fqdn: linux.ci.local
system:
enabled: true
+ name: linux
banner:
enabled: true
contents: |
diff --git a/tests/pillar/system_extra.sls b/tests/pillar/system_extra.sls
index 591e60b..ebcc42a 100644
--- a/tests/pillar/system_extra.sls
+++ b/tests/pillar/system_extra.sls
@@ -1,5 +1,9 @@
linux:
+ network:
+ enabled: true
+ hostname: linux
+ fqdn: linux.ci.local
system:
auth:
enabled: true
diff --git a/tests/pillar/system_file.sls b/tests/pillar/system_file.sls
index 8de464b..0769b18 100644
--- a/tests/pillar/system_file.sls
+++ b/tests/pillar/system_file.sls
@@ -1,5 +1,10 @@
linux:
+ network:
+ enabled: true
+ hostname: linux
+ fqdn: linux.ci.local
system:
+ name: linux
enabled: true
file:
/tmp/sample.txt: