44f6a131de
- Update to 2016.3.4 see https://docs.saltstack.com/en/latest/topics/releases/2016.3.4.html - Removed Patches, applied upstream * 0008-checksum-validation-when-zypper-pkg.download.patch * 0009-unit-tests-for-rpm.checksum-and-zypper.download.patch * 0010-snapper-execution-module.patch * 0011-fix-salt-summary-to-count-not-responding-minions-cor.patch * 0012-Run-salt-api-as-user-salt-bsc-990029.patch * 0013-Deprecate-status.uptime-one-version-later.patch * 0014-Add-ignore_repo_failure-option-to-suppress-zypper-s-.patch * 0015-Remove-zypper-s-raise-exception-if-mod_repo-has-no-a.patch * 0016-Improve-Mock-to-be-flexible-and-able-to-mock-methods.patch * 0017-Check-for-single-quote-before-splitting-on-single-qu.patch * 0018-Unit-tests-fixes-for-2016.3.2.patch * 0019-Fix-snapper_test-for-python26.patch * 0020-Integration-tests-fixes-for-2016.3.2.patch * 0021-Fix-pkg.upgrade-for-zypper.patch * 0022-Setting-up-OS-grains-for-SLES-Expanded-Support-SUSE-.patch * 0023-acl.delfacl-fix-position-of-X-option-to-setfacl.patch * 0024-Change-travis-configuration-file-to-use-salt-toaster.patch * 0025-Adding-dist-upgrade-support-to-zypper-module.patch * 0026-Fix-pkg.latest_version-when-latest-already-installed.patch * 0027-Including-resolver-params-for-Zypper-debug-solver.patch - Added patches * 0008-snapper-execution-module.patch * 0009-fix-salt-summary-to-count-not-responding-minions-cor.patch * 0010-Run-salt-api-as-user-salt-bsc-990029.patch * 0011-Fix-snapper_test-for-python26.patch * 0012-Fix-pkg.upgrade-for-zypper.patch * 0013-Setting-up-OS-grains-for-SLES-Expanded-Support-SUSE-.patch OBS-URL: https://build.opensuse.org/request/show/438684 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=81
72 lines
2.8 KiB
Diff
72 lines
2.8 KiB
Diff
From f212d9ae3ecca09808de8a770b1099d94189a2df Mon Sep 17 00:00:00 2001
|
|
From: Mihai Dinca <mdinca@suse.de>
|
|
Date: Fri, 14 Oct 2016 09:04:47 +0200
|
|
Subject: [PATCH 15/17] Change travis configuration file to use salt-toaster
|
|
|
|
---
|
|
.travis.yml | 47 +++++++++++++++++++----------------------------
|
|
1 file changed, 19 insertions(+), 28 deletions(-)
|
|
|
|
diff --git a/.travis.yml b/.travis.yml
|
|
index 7b4c8ce..3101efb 100644
|
|
--- a/.travis.yml
|
|
+++ b/.travis.yml
|
|
@@ -1,35 +1,26 @@
|
|
language: python
|
|
|
|
python:
|
|
- - '2.6'
|
|
- - '2.7'
|
|
+ - 2.7
|
|
|
|
-before_install:
|
|
- - sudo apt-get update
|
|
- - sudo apt-get install --fix-broken --ignore-missing -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" swig rabbitmq-server ruby python-apt mysql-server libmysqlclient-dev
|
|
- - (git describe && git fetch --tags) || (git remote add upstream git://github.com/saltstack/salt.git && git fetch --tags upstream)
|
|
- - pip install mock
|
|
- - pip install --allow-external http://dl.dropbox.com/u/174789/m2crypto-0.20.1.tar.gz
|
|
- - pip install --upgrade pep8 'pylint<=1.2.0'
|
|
- - pip install --upgrade coveralls
|
|
- - "if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2 ordereddict; fi"
|
|
- - pip install git+https://github.com/saltstack/salt-testing.git#egg=SaltTesting
|
|
-
|
|
-install:
|
|
- - pip install -r requirements/zeromq.txt -r requirements/cloud.txt
|
|
- - pip install --allow-all-external -r requirements/opt.txt
|
|
+services:
|
|
+ - docker
|
|
|
|
-before_script:
|
|
- - "/home/travis/virtualenv/python${TRAVIS_PYTHON_VERSION}/bin/pylint --rcfile=.testing.pylintrc salt/ && echo 'Finished Pylint Check Cleanly' || echo 'Finished Pylint Check With Errors'"
|
|
- - "/home/travis/virtualenv/python${TRAVIS_PYTHON_VERSION}/bin/pep8 --ignore=E501,E12 salt/ && echo 'Finished PEP-8 Check Cleanly' || echo 'Finished PEP-8 Check With Errors'"
|
|
+env:
|
|
+ global:
|
|
+ - VERSION=leap42sp1 FLAVOR=devel NOPULL=true SALT_REPO=..
|
|
+ matrix:
|
|
+ - TARGET=suse.tests PYTEST_CFG=./configs/$TARGET/$VERSION/$FLAVOR.cfg
|
|
+ - TARGET=saltstack.unit PYTEST_CFG=./configs/$TARGET/$VERSION/default.cfg
|
|
+ - TARGET=saltstack.integration PYTEST_CFG=./configs/$TARGET/$VERSION/default.cfg
|
|
|
|
-script: "sudo -E /home/travis/virtualenv/python${TRAVIS_PYTHON_VERSION}/bin/python setup.py test --runtests-opts='--run-destructive --sysinfo -v --coverage'"
|
|
-
|
|
-after_success:
|
|
- - coveralls
|
|
+before_install:
|
|
+- git clone --depth 1 https://github.com/openSUSE/salt-toaster.git
|
|
+- cd salt-toaster
|
|
+- echo "*" > .gitignore
|
|
+- tar xfz sandbox.tar.gz
|
|
+- sandbox/bin/pip install -r requirements.txt --exists-action w --upgrade
|
|
+- VERSION=leap42sp1 FLAVOR=default NOPULL=true make build_image
|
|
+- make build_image
|
|
|
|
-notifications:
|
|
- irc:
|
|
- channels: "irc.freenode.org#salt-devel"
|
|
- on_success: change
|
|
- on_failure: change
|
|
+script: make $TARGET PYTEST_CFG=$PYTEST_CFG
|
|
--
|
|
2.10.1
|
|
|