Drop Travis CI support
- Update links
Fixes: PROD-25037 (PROD:25037)
Fixes: PROD-25327 (PROD:25327)
Change-Id: Idaad239228e4036ad77ab822a8901bd0f4145a88
diff --git a/.kitchen.yml b/.kitchen.yml
index 277fded..2e6b8d6 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -30,90 +30,104 @@
- linux_repo_openstack
- ceilometer
- release
- pillars-from-files:
- linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%= ENV['OS_VERSION'] || 'pike' %>.sls
verifier:
name: inspec
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'%>
+
platforms:
- - name: <%=ENV['PLATFORM'] || 'saltstack-ubuntu-xenial-salt-stable' %>
+ - name: xenial-2017.7
driver_config:
- image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
+ image: *xenial-20177
+ platform: ubuntu
+
+ - name: xenial-stable
+ driver_config:
+ image: *xenial-stable
platform: ubuntu
suites:
-
- - name: agent_cluster
+<% for os_version in ['ocata','pike'] %>
+ - name: agent_cluster_<%=os_version%>
provisioner:
pillars-from-files:
ceilometer.sls: tests/pillar/agent_cluster.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
pillars:
release.sls:
ceilometer:
agent:
- version: <%= ENV['OS_VERSION'] || 'pike' %>
+ version: <%=os_version%>
- - name: agent_single
+ - name: agent_single_<%=os_version%>
provisioner:
pillars-from-files:
ceilometer.sls: tests/pillar/agent_single.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
pillars:
release.sls:
ceilometer:
agent:
- version: <%= ENV['OS_VERSION'] || 'pike' %>
+ version: <%=os_version%>
- - name: agent_single_odl
+ - name: agent_single_odl_<%=os_version%>
provisioner:
pillars-from-files:
ceilometer.sls: tests/pillar/agent_single_odl.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
pillars:
release.sls:
ceilometer:
agent:
- version: <%= ENV['OS_VERSION'] || 'pike' %>
+ version: <%=os_version%>
- - name: server_cluster
+ - name: server_cluster_<%=os_version%>
provisioner:
pillars-from-files:
ceilometer.sls: tests/pillar/server_cluster.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
pillars:
release.sls:
ceilometer:
server:
- version: <%= ENV['OS_VERSION'] || 'pike' %>
+ version: <%=os_version%>
- - name: server_gnocchi_cluster
+ - name: server_gnocchi_cluster_<%=os_version%>
provisioner:
pillars-from-files:
ceilometer.sls: tests/pillar/server_gnocchi_cluster.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
pillars:
release.sls:
ceilometer:
server:
- version: <%= ENV['OS_VERSION'] || 'pike' %>
+ version: <%=os_version%>
- - name: server_single
+ - name: server_single_<%=os_version%>
provisioner:
pillars-from-files:
ceilometer.sls: tests/pillar/server_single.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
pillars:
release.sls:
ceilometer:
server:
- version: <%= ENV['OS_VERSION'] || 'pike' %>
+ version: <%=os_version%>
- - name: server_cluster_ssl
+ - name: server_cluster_ssl_<%=os_version%>
provisioner:
pillars-from-files:
ceilometer.sls: tests/pillar/server_cluster.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
pillars:
release.sls:
ceilometer:
server:
- version: <%= ENV['OS_VERSION'] || 'pike' %>
+ version: <%=os_version%>
ssl.sls:
ceilometer:
server:
@@ -131,15 +145,16 @@
- release
- ssl
- - name: server_gnocchi_cluster_ssl
+ - name: server_gnocchi_cluster_ssl_<%=os_version%>
provisioner:
pillars-from-files:
ceilometer.sls: tests/pillar/server_gnocchi_cluster.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
pillars:
release.sls:
ceilometer:
server:
- version: <%= ENV['OS_VERSION'] || 'pike' %>
+ version: <%=os_version%>
ssl.sls:
ceilometer:
server:
@@ -157,15 +172,16 @@
- release
- ssl
- - name: agent_cluster_ssl
+ - name: agent_cluster_ssl_<%=os_version%>
provisioner:
pillars-from-files:
ceilometer.sls: tests/pillar/agent_cluster.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
pillars:
release.sls:
ceilometer:
agent:
- version: <%= ENV['OS_VERSION'] || 'pike' %>
+ version: <%=os_version%>
ssl.sls:
ceilometer:
agent:
@@ -182,5 +198,6 @@
- ceilometer
- release
- ssl
+<% end %>
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 8f3dd7d..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,56 +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=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=newton SUITE=agent_cluster
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=newton SUITE=agent_single
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=newton SUITE=server_cluster
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=newton SUITE=server_single
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=mitaka SUITE=agent_cluster
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=mitaka SUITE=agent_single
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=mitaka SUITE=server_cluster
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=mitaka SUITE=server_single
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=ocata SUITE=agent_cluster
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=ocata SUITE=agent_single
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=pike SUITE=agent_cluster
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=pike SUITE=agent_single
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=ocata SUITE=server_cluster
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=pike SUITE=server_gnocchi_cluster
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=ocata SUITE=server_single
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=pike SUITE=server_cluster
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=pike SUITE=server_single
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=pike SUITE=server_cluster_ssl
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=pike SUITE=server_gnocchi_cluster_ssl
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=pike SUITE=agent_cluster_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 7b512c4..0bc8d4b 100644
--- a/README.rst
+++ b/README.rst
@@ -380,37 +380,3 @@
* https://fedoraproject.org/wiki/QA:Testcase_OpenStack_ceilometer_install
* https://github.com/spilgames/ceilometer_graphite_publisher
* http://engineering.spilgames.com/using-ceilometer-graphite/
-
-
-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-ceilometer/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-ceilometer
-
-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 7f502d1..4d98a19 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,6 +1,6 @@
name: "ceilometer"
version: "2016.4.1"
-source: "https://github.com/openstack/salt-formula-ceilometer"
+source: "https://gerrit.mcp.mirantis.com/salt-formulas/ceilometer"
dependencies:
- name: keystone
- source: "https://github.com/salt-formulas/salt-formula-keystone"
+ source: "https://gerrit.mcp.mirantis.com/salt-formulas/keystone"
diff --git a/tests/pillar/repo_mcp_openstack_mitaka.sls b/tests/pillar/repo_mcp_openstack_mitaka.sls
deleted file mode 100644
index ea24305..0000000
--- a/tests/pillar/repo_mcp_openstack_mitaka.sls
+++ /dev/null
@@ -1,44 +0,0 @@
-linux:
- system:
- enabled: true
- repo:
- mirantis_openstack_repo:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
- pin:
- - pin: 'release a=mitaka'
- priority: 1050
- package: '*'
- mirantis_openstack_hotfix:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-hotfix main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
- pin:
- - pin: 'release a=mitaka-hotfix'
- priority: 1050
- package: '*'
- mirantis_openstack_security:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-security main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
- pin:
- - pin: 'release a=mitaka-security'
- priority: 1050
- package: '*'
- mirantis_openstack_updates:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-updates main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
- pin:
- - pin: 'release a=mitaka-uptades'
- priority: 1050
- package: '*'
- mirantis_openstack_holdback:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }} mitaka-holdback main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/{{ grains.get('oscodename') }}/archive-mcpmitaka.key"
- pin:
- - pin: 'release a=mitaka-holdback'
- priority: 1050
- package: '*'
diff --git a/tests/pillar/repo_mcp_openstack_newton.sls b/tests/pillar/repo_mcp_openstack_newton.sls
deleted file mode 100644
index 2bdfb69..0000000
--- a/tests/pillar/repo_mcp_openstack_newton.sls
+++ /dev/null
@@ -1,44 +0,0 @@
-linux:
- system:
- enabled: true
- repo:
- mirantis_openstack_repo:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }} newton main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }}/archive-mcpnewton.key"
- pin:
- - pin: 'release a=newton'
- priority: 1050
- package: '*'
- mirantis_openstack_hotfix:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }} newton-hotfix main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }}/archive-mcpnewton.key"
- pin:
- - pin: 'release a=newton-hotfix'
- priority: 1050
- package: '*'
- mirantis_openstack_security:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }} newton-security main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }}/archive-mcpnewton.key"
- pin:
- - pin: 'release a=newton-security'
- priority: 1050
- package: '*'
- mirantis_openstack_updates:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }} newton-updates main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }}/archive-mcpnewton.key"
- pin:
- - pin: 'release a=newton-updates'
- priority: 1050
- package: '*'
- mirantis_openstack_holdback:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }} newton-holdback main"
- architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/{{ grains.get('oscodename') }}/archive-mcpnewton.key"
- pin:
- - pin: 'release a=newton-holdback'
- priority: 1050
- package: '*'