Fix kitchen CI
There is no guarntee that pillars are loaded before pillars-from-file
as result we cant assume variables defined via pillars: are available
when pillars-from-file is loaded. Move 'source' definitions of repos to
.kitchen.yml as it uses ENV variable
Change-Id: Id94edd2351f17f5ac130db41a97d3be9cd5f3be4
diff --git a/.kitchen.yml b/.kitchen.yml
index e6d3f6b..6bc9957 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -31,6 +31,7 @@
base:
"*":
- versions
+ - repos_base
- repos
- galera
versions.sls:
@@ -38,6 +39,18 @@
version:
mysql: <%= ENV['MYSQL_VER'] || '5.6' %>
galera: <%= ENV['GALERA_VER'] || '3' %>
+ # NOTE(vsaienko) There is no guarntee that pillars are loaded before pillars-from-file
+ # as result we cant assume variables defined via pillars: are available when pillars-from-file
+ # is loaded. Move 'source' definitions of repos to .kitchen.yml as it used ENV variable
+ repos_base.sls:
+ linux:
+ system:
+ enabled: true
+ repo:
+ galeracluster:
+ source: deb http://releases.galeracluster.com/galera-<%=ENV['GALERA_VER'] || '3'%>/ubuntu {{ grains.get('oscodename') }} main
+ mysql-wsrep:
+ source: deb http://releases.galeracluster.com/mysql-wsrep-<%=ENV['MYSQL_VER'] || '5.6'%>/ubuntu {{ grains.get('oscodename') }} main
pillars-from-files:
repos.sls: tests/pillar/repo_galeracluster.sls
diff --git a/tests/pillar/repo_galeracluster.sls b/tests/pillar/repo_galeracluster.sls
index 461b584..9e9c1bf 100644
--- a/tests/pillar/repo_galeracluster.sls
+++ b/tests/pillar/repo_galeracluster.sls
@@ -3,7 +3,6 @@
enabled: true
repo:
galeracluster:
- source: 'deb http://releases.galeracluster.com/galera-{{ pillar.galera.version.galera }}/ubuntu {{ grains.get('oscodename') }} main'
key_id: BC19DDBA
key_server: hkp://p80.pool.sks-keyservers.net:80
pin:
@@ -11,7 +10,6 @@
priority: 1001
package: '*'
mysql-wsrep:
- source: 'deb http://releases.galeracluster.com/mysql-wsrep-{{ pillar.galera.version.mysql }}/ubuntu {{ grains.get('oscodename') }} main'
key_id: BC19DDBA
key_server: hkp://p80.pool.sks-keyservers.net:80
pin: