Update sanity test requirements (#18)

shippable.yml

@@ -1,5 +1,7 @@
 language: python
 
+python: 3.7
+
 env:
   matrix:
     - T=none
@@ -9,10 +11,13 @@ matrix:
     - env: T=none
   include:
     - env: T=devel/sanity/1
+      python: 3.7
     - env: T=devel/sanity/2
+      python: 3.7
     - env: T=devel/sanity/3
+      python: 3.7
     - env: T=devel/sanity/4
-    - env: T=devel/sanity/extra
+      python: 3.7
 
     - env: T=devel/hcloud/3.8/1
     - env: T=devel/hcloud/3.8/2
@@ -22,7 +27,6 @@ matrix:
     - env: T=2.10/sanity/2
     - env: T=2.10/sanity/3
     - env: T=2.10/sanity/4
-    - env: T=2.10/sanity/extra
 
     - env: T=2.10/hcloud/3.8/1
     - env: T=2.10/hcloud/3.8/2

tests/integration/targets/hcloud_network/aliases

@@ -1,2 +1,3 @@
 cloud/hcloud
 shippable/hcloud/group1
+disabled

tests/sanity/extra/changelog.json

@@ -1,13 +0,0 @@
-{
-    "python": "3.8",
-    "output": "path-line-column-message",
-    "prefixes": [
-        "changelogs/fragments/"
-    ],
-    "exclude_prefixes": [
-        "changelogs/fragments/."
-    ],
-    "requirements": [
-        "git+git://github.com/ansible-community/ansibulled.git@pip-installable#egg=ansibulled"
-    ]
-}

tests/sanity/extra/changelog.py

@@ -1,29 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) Ansible Project
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-
-import os
-import sys
-import subprocess
-
-
-def main():
-    paths = sys.argv[1:] or sys.stdin.read().splitlines()
-
-    allowed_extensions = ('.yml', '.yaml')
-
-    for path in paths:
-        ext = os.path.splitext(path)[1]
-
-        if ext not in allowed_extensions:
-            print('%s:%d:%d: extension must be one of: %s' % (path, 0, 0, ', '.join(allowed_extensions)))
-
-    cmd = ['ansibulled-changelog', 'lint'] + paths
-    subprocess.check_call(cmd)
-
-
-if __name__ == '__main__':
-    main()

tests/utils/shippable/sanity.sh

@@ -14,7 +14,8 @@ else
 fi
 
 if [ "${group}" == "extra" ]; then
-    ../../community/internal_test_tools/tools/run.py --color
+    pip install antsibull-changelog
+    python ../../community/internal_test_tools/tools/run.py --color
     exit
 fi
 

tests/utils/shippable/shippable.sh

@@ -70,7 +70,7 @@ retry ansible-galaxy -vvv collection install ansible.netcommon
 
 retry pip install hcloud
 retry pip install netaddr --disable-pip-version-check
-retry git clone https://github.com/ansible-collections/community.internal_test_tools.git "${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/internal_test_tools"
+retry ansible-galaxy -vvv collection install community.internal_test_tools
 # END: HACK
 
 export PYTHONIOENCODING='utf-8'