Merge "Add ability to set build_rate_limit for octavia manager" into release/2019.2.0
diff --git a/.kitchen.yml b/.kitchen.yml
index 2919a16..eac348e 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -18,11 +18,11 @@
- name: linux
repo: git
source: https://gerrit.mcp.mirantis.com/salt-formulas/linux
- branch: <%=ENV['GERRIT_BRANCH'] || 'master' %>
+ branch: <%=ENV['GERRIT_BRANCH'] || 'release/2019.2.0' %>
- name: oslo_templates
repo: git
source: https://gerrit.mcp.mirantis.com/salt-formulas/oslo-templates
- branch: <%=ENV['GERRIT_BRANCH'] || 'master' %>
+ branch: <%=ENV['GERRIT_BRANCH'] || 'release/2019.2.0' %>
state_top:
base:
"*":
@@ -40,8 +40,7 @@
sudo: true
docker_images:
- - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19'%>
- - &xenial-stable <%=ENV['IMAGE_XENIAL_STABLE'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
+ - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/mirantis/drivetrain/salt-formulas-ci/salt-formulas-ci-xenial-2017.7:latest'%>
platforms:
- name: xenial-2017.7
@@ -49,13 +48,8 @@
image: *xenial-20177
platform: ubuntu
- - name: xenial-stable
- driver_config:
- image: *xenial-stable
- platform: ubuntu
-
suites:
-<% for os_version in ['ocata','pike','queens'] %>
+<% for os_version in ['pike','queens'] %>
- name: api_single_<%=os_version%>
provisioner:
pillars-from-files:
diff --git a/tests/pillar/repo_openstack_ocata.sls b/tests/pillar/repo_openstack_ocata.sls
deleted file mode 100644
index a638cf6..0000000
--- a/tests/pillar/repo_openstack_ocata.sls
+++ /dev/null
@@ -1,8 +0,0 @@
-linux:
- system:
- enabled: true
- repo:
- mirantis_openstack:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/ocata/xenial ocata main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/xenial/archive-mcpocata.key"
diff --git a/tests/pillar/repo_openstack_pike.sls b/tests/pillar/repo_openstack_pike.sls
index 43f930e..fe6af3c 100644
--- a/tests/pillar/repo_openstack_pike.sls
+++ b/tests/pillar/repo_openstack_pike.sls
@@ -2,7 +2,11 @@
system:
enabled: true
repo:
- mirantis_openstack:
- source: "deb https://mirror.mirantis.com/nightly/openstack-pike/xenial xenial main"
+ mirantis_openstack_repo:
+ source: "deb http://mirror.mirantis.com/update/2019.2.0/openstack-pike/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
architectures: amd64
- key_url: "https://mirror.mirantis.com/nightly/openstack-pike/xenial/archive-pike.key"
+ key_url: "http://mirror.mirantis.com/update/2019.2.0/openstack-pike/{{ grains.get('oscodename') }}/archive-pike.key"
+ pin:
+ - pin: 'release l=pike'
+ priority: 1050
+ package: '*'
\ No newline at end of file
diff --git a/tests/pillar/repo_openstack_queens.sls b/tests/pillar/repo_openstack_queens.sls
index c140618..ebe1964 100644
--- a/tests/pillar/repo_openstack_queens.sls
+++ b/tests/pillar/repo_openstack_queens.sls
@@ -2,7 +2,11 @@
system:
enabled: true
repo:
- mirantis_openstack:
- source: "deb https://mirror.mirantis.com/nightly/openstack-queens/xenial/ xenial main"
+ mirantis_openstack_repo:
+ source: "deb http://mirror.mirantis.com/update/2019.2.0/openstack-queens/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
architectures: amd64
- key_url: "https://mirror.mirantis.com/nightly/openstack-queens/xenial/archive-queens.key"
+ key_url: "http://mirror.mirantis.com/update/2019.2.0/openstack-queens/{{ grains.get('oscodename') }}/archive-queens.key"
+ pin:
+ - pin: 'release l=queens'
+ priority: 1050
+ package: '*'
\ No newline at end of file