Drop Travis CI support
- Update links
Fixes: PROD-25037 (PROD:25037)
Fixes: PROD-25327 (PROD:25327)
Change-Id: If222366285506b66d5860ffc0943b7caf7632f6e
diff --git a/.kitchen.yml b/.kitchen.yml
index bdfb2b6..65961cd 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -28,28 +28,44 @@
name: inspec
sudo: true
+docker_images:
+ - &trusty-20177 <%=ENV['IMAGE_TRUSTY_20177'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-trusty-salt-2017.7/salt:2018_11_19'%>
+ - &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'%>
platforms:
- - name: <%=ENV['PLATFORM'] || 'saltstack-ubuntu-xenial-salt-stable' %>
+ - name: trusty-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: *trusty-20177
+ platform: ubuntu
+
+ - name: xenial-2017.7
+ driver_config:
+ image: *xenial-20177
+ platform: ubuntu
+
+ - name: xenial-stable
+ driver_config:
+ image: *xenial-stable
platform: ubuntu
suites:
-
- - name: apache_server_php5
+ - name: server-php5
provisioner:
pillars-from-files:
- apache.sls: tests/pillar/apache_server_php5.sls
+ apache.sls: tests/pillar/server_php5.sls
+ includes: trusty-2017.7
- - name: apache_server_php7
+ - name: server-php7
provisioner:
pillars-from-files:
- apache.sls: tests/pillar/apache_server_php7.sls
+ apache.sls: tests/pillar/server_php7.sls
+ excludes: trusty-2017.7
- - name: apache_server_php7_ssl
+ - name: server-php7-ssl
provisioner:
pillars-from-files:
- apache.sls: tests/pillar/apache_server_php7_ssl.sls
+ apache.sls: tests/pillar/server_php7_ssl.sls
+ excludes: trusty-2017.7
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ea452da..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,41 +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-trusty-salt-2017.7/salt:2018_11_19 SUITE=apache-server-php5
- - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=apache-server-php7
- - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=apache-server-php7-ssl
- - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=apache-server-php7
- - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=apache-server-php7-ssl
-
-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/README.rst b/README.rst
index 706bf0b..53c81fa 100644
--- a/README.rst
+++ b/README.rst
@@ -503,36 +503,3 @@
* https://httpd.apache.org/docs/
-
-Documentation and Bugs
-======================
-
-To learn how to install and update salt-formulas, consult the documentation
-available online at:
-
- http://salt-formulas.readthedocs.io/
-
-In the unfortunate event that bugs are discovered, they should be reported to
-the appropriate issue tracker. Use Github issue tracker for specific salt
-formula:
-
- https://github.com/salt-formulas/salt-formula-apache/issues
-
-For feature requests, bug reports or blueprints affecting entire ecosystem,
-use Launchpad salt-formulas project:
-
- https://launchpad.net/salt-formulas
-
-You can also join salt-formulas-users team and subscribe to mailing list:
-
- https://launchpad.net/~salt-formulas-users
-
-Developers wishing to work on the salt-formulas projects should always base
-their work on master branch and submit pull request against specific formula.
-
- https://github.com/salt-formulas/salt-formula-apache
-
-Any questions or feedback is always welcome so feel free to join our IRC
-channel:
-
- #salt-formulas @ irc.freenode.net
diff --git a/metadata.yml b/metadata.yml
index c8bab8a..f2f75e6 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,3 +1,3 @@
name: "apache"
version: "0.2"
-source: "https://github.com/salt-formulas/salt-formula-apache"
+source: "https://gerrit.mcp.mirantis.com/salt-formulas/apache"
diff --git a/tests/pillar/apache_server_php5.sls b/tests/pillar/server_php5.sls
similarity index 100%
rename from tests/pillar/apache_server_php5.sls
rename to tests/pillar/server_php5.sls
diff --git a/tests/pillar/apache_server_php7.sls b/tests/pillar/server_php7.sls
similarity index 100%
rename from tests/pillar/apache_server_php7.sls
rename to tests/pillar/server_php7.sls
diff --git a/tests/pillar/apache_server_php7_ssl.sls b/tests/pillar/server_php7_ssl.sls
similarity index 100%
rename from tests/pillar/apache_server_php7_ssl.sls
rename to tests/pillar/server_php7_ssl.sls