Skip to content
This repository has been archived by the owner on May 31, 2023. It is now read-only.

fix CI; remove company from role description #2

Merged
merged 2 commits into from
Nov 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,22 @@ language: python
cache: pip
services:
- docker
env:
- ANSIBLE=2.2.3
- ANSIBLE=2.3.2
- ANSIBLE=2.4.1
install:
- pip install ansible==2.3.2 molecule==1.25.0 docker git-semver testinfra>=1.7.0
- pip install ansible==${ANSIBLE} ansible-lint>=3.4.15 molecule==1.25.0 docker git-semver testinfra>=1.7.0
script:
- molecule test
deploy:
provider: script
skip_cleanup: true
script:
- ./.travis/generatetag.sh
script: ./.travis/generatetag.sh
on:
branch: master
#do not start when tag is added
branches:
only:
- master
tags:
except:
- /^\d+\.\d+\.\d+$/
notifications:
webhooks: https://galaxy.ansible.com/api/v1/notifications/
#after_script:
# - ./.travis/notification.sh
webhooks: https://galaxy.ansible.com/api/v1/notifications/
18 changes: 9 additions & 9 deletions .travis/generatetag.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/bin/bash

#git config --global user.email ""
#git config --global user.name ""
#GIT_TAG=$([[ "$TRAVIS_COMMIT_MESSAGE" =~ ("Merge pull request".*/feature.*) ]] && git semver --next-minor || git semver --next-patch )
#echo $GIT_TAG
#git tag $GIT_TAG -a -m "Generated tag from TravisCI for build $TRAVIS_BUILD_NUMBER"
#GIT_URL=$(git config --get remote.origin.url)
#GIT_URL=${GIT_URL#*//}
#
#git push https://${GH_TOKEN}:@${GIT_URL} --tags
git config --global user.email "[email protected]"
git config --global user.name "paulfantom"
GIT_TAG=$([[ "$TRAVIS_COMMIT_MESSAGE" =~ ("Merge pull request".*/feature.*) ]] && git semver --next-minor || git semver --next-patch )
echo $GIT_TAG
git tag $GIT_TAG -a -m "Generated tag from TravisCI for build $TRAVIS_BUILD_NUMBER"
GIT_URL=$(git config --get remote.origin.url)
GIT_URL=${GIT_URL#*//}

git push https://${GH_TOKEN}:@${GIT_URL} --tags || exit 0
3 changes: 1 addition & 2 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
galaxy_info:
author: Pawel Krupa
description: Grafana - platform for analytics and monitoring
company: Sointeractive
license: MIT
min_ansible_version: 1.9
min_ansible_version: 2.2
platforms:
- name: Ubuntu
versions:
Expand Down
2 changes: 1 addition & 1 deletion tasks/dashboards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
- name: Replace datasource variable names
become: no
replace:
path: "/tmp/dashboards/{{ item.dashboard_id }}.json"
dest: "/tmp/dashboards/{{ item.dashboard_id }}.json"
regexp: "[$].DS_.*}"
replace: "{{ item.datasource }}"
delegate_to: localhost
Expand Down