diff --git a/.drone.yml b/.drone.yml index 2c322cc..7250a33 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,4 +10,4 @@ steps: commands: - pip install -e . - export INSTANCE_UUID=$(echo $$RANDOM) - - cd integration-test-role && molecule test + - cd integration && molecule test diff --git a/Makefile b/Makefile index 3cc3183..8cb7e49 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -DIRECTORY := integration-test-role +DIRECTORY := integration DRIVER := hetznercloud default: test diff --git a/integration-test-role/.travis.yml b/integration-test-role/.travis.yml deleted file mode 100644 index 49e7e1c..0000000 --- a/integration-test-role/.travis.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -language: python -python: "2.7" - -# Use the new container infrastructure -sudo: false - -# Install ansible -addons: - apt: - packages: - - python-pip - -install: - # Install ansible - - pip install ansible - - # Check ansible version - - ansible --version - - # Create ansible.cfg with correct roles_path - - printf '[defaults]\nroles_path=../' >ansible.cfg - -script: - # Basic role syntax check - - ansible-playbook tests/test.yml -i tests/inventory --syntax-check - -notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/integration-test-role/README.md b/integration-test-role/README.md deleted file mode 100644 index 225dd44..0000000 --- a/integration-test-role/README.md +++ /dev/null @@ -1,38 +0,0 @@ -Role Name -========= - -A brief description of the role goes here. - -Requirements ------------- - -Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. - -Role Variables --------------- - -A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. - -Dependencies ------------- - -A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. - -Example Playbook ----------------- - -Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: - - - hosts: servers - roles: - - { role: username.rolename, x: 42 } - -License -------- - -BSD - -Author Information ------------------- - -An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/integration-test-role/defaults/main.yml b/integration-test-role/defaults/main.yml deleted file mode 100644 index 4861170..0000000 --- a/integration-test-role/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# defaults file for integration-test-role diff --git a/integration-test-role/handlers/main.yml b/integration-test-role/handlers/main.yml deleted file mode 100644 index 7d10c68..0000000 --- a/integration-test-role/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for integration-test-role diff --git a/integration-test-role/meta/main.yml b/integration-test-role/meta/main.yml deleted file mode 100644 index 45b0a2a..0000000 --- a/integration-test-role/meta/main.yml +++ /dev/null @@ -1,52 +0,0 @@ -galaxy_info: - author: your name - description: your role description - company: your company (optional) - - # If the issue tracker for your role is not on github, uncomment the - # next line and provide a value - # issue_tracker_url: http://example.com/issue/tracker - - # Choose a valid license ID from https://spdx.org - some suggested licenses: - # - BSD-3-Clause (default) - # - MIT - # - GPL-2.0-or-later - # - GPL-3.0-only - # - Apache-2.0 - # - CC-BY-4.0 - license: license (GPL-2.0-or-later, MIT, etc) - - min_ansible_version: 2.9 - - # If this a Container Enabled role, provide the minimum Ansible Container version. - # min_ansible_container_version: - - # - # Provide a list of supported platforms, and for each platform a list of versions. - # If you don't wish to enumerate all versions for a particular platform, use 'all'. - # To view available platforms and versions (or releases), visit: - # https://galaxy.ansible.com/api/v1/platforms/ - # - # platforms: - # - name: Fedora - # versions: - # - all - # - 25 - # - name: SomePlatform - # versions: - # - all - # - 1.0 - # - 7 - # - 99.99 - - galaxy_tags: [] - # List tags for your role here, one per line. A tag is a keyword that describes - # and categorizes the role. Users find roles by searching for tags. Be sure to - # remove the '[]' above, if you add tags to this list. - # - # NOTE: A tag is limited to a single word comprised of alphanumeric characters. - # Maximum 20 tags per role. - -dependencies: [] - # List your role dependencies here, one per line. Be sure to remove the '[]' above, - # if you add dependencies to this list. diff --git a/integration-test-role/molecule/default/INSTALL.rst b/integration-test-role/molecule/default/INSTALL.rst deleted file mode 100644 index 74b5cbf..0000000 --- a/integration-test-role/molecule/default/INSTALL.rst +++ /dev/null @@ -1,16 +0,0 @@ -*************************************** -Hetzner Cloud plugin installation guide -*************************************** - -Requirements -============ - -* Ansible >= 2.9 -* ``HCLOUD_TOKEN`` exposed in your environment - -Install -======= - -.. code-block:: bash - - $ pip install molecule-hetznercloud diff --git a/integration-test-role/molecule/default/prepare.yml b/integration-test-role/molecule/default/prepare.yml deleted file mode 100644 index ddb01fb..0000000 --- a/integration-test-role/molecule/default/prepare.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: Prepare - hosts: all - gather_facts: false - tasks: - - name: Install python for Ansible - raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal python-zipstream) - become: true - changed_when: false diff --git a/integration-test-role/molecule/default/verify.yml b/integration-test-role/molecule/default/verify.yml deleted file mode 100644 index a82dd6f..0000000 --- a/integration-test-role/molecule/default/verify.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -# This is an example playbook to execute Ansible tests. - -- name: Verify - hosts: all - tasks: - - name: Example assertion - assert: - that: true diff --git a/integration-test-role/tasks/main.yml b/integration-test-role/tasks/main.yml deleted file mode 100644 index 2091c38..0000000 --- a/integration-test-role/tasks/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# tasks file for integration-test-role diff --git a/integration-test-role/tests/inventory b/integration-test-role/tests/inventory deleted file mode 100644 index 2fbb50c..0000000 --- a/integration-test-role/tests/inventory +++ /dev/null @@ -1 +0,0 @@ -localhost diff --git a/integration-test-role/tests/test.yml b/integration-test-role/tests/test.yml deleted file mode 100644 index 1f2b86a..0000000 --- a/integration-test-role/tests/test.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- hosts: localhost - remote_user: root - roles: - - integration-test-role diff --git a/integration-test-role/vars/main.yml b/integration-test-role/vars/main.yml deleted file mode 100644 index c522e12..0000000 --- a/integration-test-role/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for integration-test-role diff --git a/integration-test-role/.yamllint b/integration/.yamllint similarity index 94% rename from integration-test-role/.yamllint rename to integration/.yamllint index 8827676..c322713 100644 --- a/integration-test-role/.yamllint +++ b/integration/.yamllint @@ -1,7 +1,5 @@ --- -# Based on ansible-lint config extends: default - rules: braces: max-spaces-inside: 1 diff --git a/integration-test-role/molecule/default/converge.yml b/integration/molecule/default/converge.yml similarity index 100% rename from integration-test-role/molecule/default/converge.yml rename to integration/molecule/default/converge.yml diff --git a/integration-test-role/molecule/default/create.yml b/integration/molecule/default/create.yml similarity index 100% rename from integration-test-role/molecule/default/create.yml rename to integration/molecule/default/create.yml diff --git a/integration-test-role/molecule/default/destroy.yml b/integration/molecule/default/destroy.yml similarity index 100% rename from integration-test-role/molecule/default/destroy.yml rename to integration/molecule/default/destroy.yml diff --git a/integration-test-role/molecule/default/molecule.yml b/integration/molecule/default/molecule.yml similarity index 100% rename from integration-test-role/molecule/default/molecule.yml rename to integration/molecule/default/molecule.yml diff --git a/integration/tasks/main.yml b/integration/tasks/main.yml new file mode 100644 index 0000000..fb521c8 --- /dev/null +++ b/integration/tasks/main.yml @@ -0,0 +1,4 @@ +--- +- name: Debug output + debug: + msg: "Hello, World"