Formulas testing revision 2019/10
Related: PROD-32744
Related: PROD-33634
Related: PROD-33698
Fixes: PROD-33985
Change-Id: I48780db0049e5d6d53b74432b2b0c68c47b1f047
diff --git a/.kitchen.yml b/.kitchen.yml
index 8c96166..4c52644 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -23,23 +23,24 @@
base:
"*":
- reclass
+ init_environment: |
+ sudo apt-get install -y python-netaddr python-pip || true
+ sudo pip install git+http://gerrit.mcp.mirantis.com/packaging/sources/reclass@mcp/xenial/extra
verifier:
name: inspec
sudo: true
+docker_images:
+ - &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: <%=ENV['PLATFORM'] || 'saltstack-ubuntu-xenial-salt-stable' %>
+ - name: xenial-2017.7
driver_config:
- image: <%=ENV['PLATFORM'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
+ image: *xenial-20177
platform: ubuntu
- provisioner:
- init_environment: |
- sudo yum install -y python-netaddr || sudo apt-get install -y python-netaddr || true
suites:
-
- name: class_mapping
provisioner:
pillars-from-files:
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 7639086..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-language: python
-python:
-- "2.7.13"
-sudo: required
-services:
- - docker
-
-install:
- - pip install PyYAML
- - pip install virtualenv
- - |
- if [ ! -e Gemfile ]; then
- curl -s -o ./Gemfile 'https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas/salt-formulas-scripts.git;a=blob_plain;f=Gemfile;hb=refs/heads/master'
- fi
- - bundle install
-
-env:
- - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=class-mapping
- - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=generate-multi
- - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=generate-single
- - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=storage-local
- - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=storage-nodes-uri
- - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=class-mapping
- - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=generate-multi
- - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=generate-single
- - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=storage-local
- - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=storage-nodes-uri
- - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=class-mapping
- - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=generate-multi
- - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=generate-single
- - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=storage-local
- - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=storage-nodes-uri
-
-before_script:
- - set -o pipefail
- - make test | tail
-
-script:
- - test ! -e .kitchen.yml || bundle exec kitchen converge ${SUITE} || true
- - test ! -e .kitchen.yml || bundle exec kitchen verify ${SUITE} -t tests/integration
-
-notifications:
- webhooks:
- urls:
- - https://webhooks.gitter.im/e/6123573504759330786b
- on_success: change # options: [always|never|change] default: always
- on_failure: never # options: [always|never|change] default: always
- on_start: never # options: [always|never|change] default: always
- on_cancel: never # options: [always|never|change] default: always
- on_error: never # options: [always|never|change] default: always
- email: false
diff --git a/reclass/storage/service.sls b/reclass/storage/service.sls
index 5c43c4d..3d1da17 100644
--- a/reclass/storage/service.sls
+++ b/reclass/storage/service.sls
@@ -20,8 +20,7 @@
{%- elif storage.source.engine == 'git' %}
storage_install_git_python_pip:
pkg.installed:
- - names:
- - {{ storage.dependency.pkgs }}
+ - names: {{ storage.dependency.pkgs }}
storage_install_reclass_git:
pip.installed:
@@ -36,8 +35,7 @@
{%- elif storage.source.engine == 'pip' %}
storage_install_python_pip:
pkg.installed:
- - names:
- - {{ storage.dependency.pkgs }}
+ - names: {{ storage.dependency.pkgs }}
storage_install_reclass_pip:
pip.installed:
@@ -46,7 +44,7 @@
- force_reinstall: True
- ignore_installed: True
- require:
- - pkg: storage_install_git_python_pip
+ - pkg: storage_install_python_pip
{%- endif %}
{%- endif %}
diff --git a/tests/pillar/storage_git.sls b/tests/pillar/storage_git.sls
index 7dd9aba..c8dd687 100644
--- a/tests/pillar/storage_git.sls
+++ b/tests/pillar/storage_git.sls
@@ -4,5 +4,5 @@
base_dir: /srv/reclass
source:
engine: git
- repo: git+https://github.com/salt-formulas/reclass
- branch: master
+ repo: git+http://gerrit.mcp.mirantis.com/packaging/sources/reclass
+ branch: mcp/xenial/extra