From 8c5e2e2a661d4bbb7dc9c2f40407b00a70e29b8c Mon Sep 17 00:00:00 2001 From: Massimiliano Pippi Date: Thu, 14 Jun 2018 12:28:50 +0200 Subject: [PATCH] [ci skip] cleanup stale files, update github templates --- .github/ISSUE_TEMPLATE.md | 33 ++---------------- .github/PULL_REQUEST_TEMPLATE.md | 17 +++------- CHANGELOG.md | 8 ----- CONTRIBUTING.md | 9 +++++ circle.yml | 57 -------------------------------- 5 files changed, 16 insertions(+), 108 deletions(-) delete mode 100644 CHANGELOG.md create mode 100644 CONTRIBUTING.md delete mode 100644 circle.yml diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 45113b8fd2..e8ae97ef38 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,46 +1,17 @@ - - -**Output of the [info page](https://help.datadoghq.com/hc/en-us/articles/203764635-Agent-Status-and-Information) ** - -``` +```text (paste your output here) ``` **Additional environment details (Operating System, Cloud provider, etc):** - **Steps to reproduce the issue:** 1. 2. 3. - **Describe the results you received:** diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 053c3c5b33..a0f7316c0b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,3 @@ - - ### What does this PR do? A brief description of the change being made with this pull request. @@ -9,16 +6,12 @@ A brief description of the change being made with this pull request. What inspired you to submit this pull request? -### Testing Guidelines - -An overview on [testing](https://github.com/DataDog/dd-agent/blob/master/tests/README.md) -is available in our contribution guidelines. - -### Versioning +### Review checklist -- [ ] Bumped the version check in `manifest.json` -- [ ] Updated `CHANGELOG.md` -- [ ] If PR impacts documentation, docs team has been notified or [an issue has been opened on the documentation repository](https://github.com/DataDog/documentation/issues/new) +- [ ] PR has a [meaningful title](https://github.com/DataDog/integrations-core/blob/master/CONTRIBUTING.md#pull-request-title) or PR has the `no-changelog` label attached +- [ ] Feature or bugfix has tests +- [ ] Git history is clean +- [ ] If PR impacts documentation, docs team has been notified or an issue has been opened on the [documentation repo](https://github.com/DataDog/documentation/issues/new) ### Additional Notes diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index c39c7f811f..0000000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ -# CHANGELOG - Uptime.com - - -1.0.0 / Unreleased -================== -### Changes - -* [FEATURE] Initial Uptime.com tile. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000000..c635ff0cd1 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,9 @@ +# Contributing + +First of all, thanks for contributing! + +In the effort of keeping the development experience consistent between `integrations-extras` +and `integrations-core`, the contribution guidelines are the same for both the +projects and are outlined in [this document][0]. + +[0]: https://github.com/DataDog/integrations-core/blob/master/CONTRIBUTING.md diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 7df36fd4b1..0000000000 --- a/circle.yml +++ /dev/null @@ -1,57 +0,0 @@ -machine: - python: - version: 2.7.10 - ruby: - version: 2.2.6 - services: - - docker - environment: - NOSE_FILTER: 'not windows and not fixme' - VOLATILE_DIR: '/tmp/integration-sdk-testing' - SKIP_CLEANUP: 'true' - INTEGRATIONS_DIR: "$HOME/embedded" - CI_BUILD_DIR: "$HOME/$CIRCLE_PROJECT_REPONAME" - PIP_CACHE: "$HOME/.cache/pip" - SDK_TESTING: "true" - DD_AGENT_BRANCH: "master" - CORE_BRANCH: "master" - JMXFETCH_URL: "https://dd-jmxfetch.s3.amazonaws.com" - REQ_LOCALS: "$HOME/$CIRCLE_PROJECT_REPONAME,$HOME/dd-agent,$HOME/integrations-core" - -dependencies: - pre: - - sudo apt-get update ; sudo apt-get install -y curl apt-transport-https git snmp snmp-mibs-downloader - - git -C $HOME/dd-agent pull || git clone -b $DD_AGENT_BRANCH --depth 1 https://github.com/DataDog/dd-agent.git $HOME/dd-agent - - git -C $HOME/integrations-core pull || git clone -b $CORE_BRANCH --depth 1 https://github.com/DataDog/integrations-core.git $HOME/integrations-core - - echo "$HOME/dd-agent/" > $(dirname $(pyenv which python))/../lib/python2.7/site-packages/datadog-agent.pth - - echo "$HOME/dd-agent/" > $(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")/datadog-agent.pth - - pip install pip --upgrade - - pip install docker-compose - - pip install pylint - - if [ -e ~/$CIRCLE_PROJECT_REPONAME/requirements.txt ]; then pip install -r ~/$CIRCLE_PROJECT_REPONAME/requirements.txt; fi - - if [ -e ~/$CIRCLE_PROJECT_REPONAME/requirements-test.txt ]; then pip install -r ~/$CIRCLE_PROJECT_REPONAME/requirements-test.txt; fi - - if [ -e ~/$CIRCLE_PROJECT_REPONAME/requirements-opt.txt ]; then pip install -r ~/$CIRCLE_PROJECT_REPONAME/requirements-opt.txt; fi - - if [ -e ~/dd-agent/requirements.txt ]; then pip install -r ~/dd-agent/requirements.txt; fi - - if [ -e ~/$CIRCLE_PROJECT_REPONAME/Gemfile ]; then cd ~/$CIRCLE_PROJECT_REPONAME ; bundle install; cd - ; fi - - if [ -e ~/$CIRCLE_PROJECT_REPONAME/Gemfile ]; then cd ~/$CIRCLE_PROJECT_REPONAME ; bundle exec rake setup_agent_libs; cd - ; fi - -test: - override: - - bundle exec rake prep_travis_ci - - TRAVIS_FLAVOR="default" bundle exec rake ci:run - - TRAVIS_FLAVOR="filebeat" bundle exec rake ci:run - - TRAVIS_FLAVOR="snmpwalk" bundle exec rake ci:run - - TRAVIS_FLAVOR="hbase_master" bundle exec rake ci:run - - TRAVIS_FLAVOR="hbase_regionserver" bundle exec rake ci:run - - TRAVIS_FLAVOR="redis_sentinel" FLAVOR_VERSION="latest" bundle exec rake ci:run - - TRAVIS_FLAVOR="storm" bundle exec rake ci:run - - TRAVIS_FLAVOR="logstash" bundle exec rake ci:run - - TRAVIS_FLAVOR="stardog" bundle exec rake ci:run - - TRAVIS_FLAVOR="upsc" bundle exec rake ci:run - - TRAVIS_FLAVOR="gnatsd_streaming" bundle exec rake ci:run - - TRAVIS_FLAVOR="gnatsd" bundle exec rake ci:run - - rake ci:run[aerospike] - - rake ci:run[default] - - bundle exec rake requirements - post: - - if [[ $(docker ps -a -q) ]]; then docker stop $(docker ps -a -q); fi