From 289efb4db561c0cc77b94f4acd77820338c3528a Mon Sep 17 00:00:00 2001 From: Martin Polreich Date: Mon, 14 Oct 2019 17:08:35 +0200 Subject: [PATCH] Formulas testing revision 2019/10 Related: PROD-32744 Related: PROD-33634 Related: PROD-33698 Change-Id: Ie2f79621d65a720aecfcd4b9cbb2d33f973e9fc1 --- .kitchen.yml | 10 +++++++--- .travis.yml | 45 --------------------------------------------- 2 files changed, 7 insertions(+), 48 deletions(-) delete mode 100644 .travis.yml diff --git a/.kitchen.yml b/.kitchen.yml index 396dd27..0b87e11 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -30,16 +30,20 @@ provisioner: dependencies: - name: linux repo: git - source: https://github.com/salt-formulas/salt-formula-linux.git + source: https://gerrit.mcp.mirantis.com/salt-formulas/linux.git + branch: <%=ENV['GERRIT_BRANCH'] || 'release/2019.2.0' %> 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 suites: diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c74699b..0000000 --- a/.travis.yml +++ /dev/null @@ -1,45 +0,0 @@ -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=single - - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=cluster - - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=curator - - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=client - - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=single - - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=cluster - - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=curator - - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=client - - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=single - - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=cluster - - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=curator - - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=client - -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 -- 2.32.7