Merge pull request #2 from ngine-io/tests

enable tests
ngine-io · Jul 15, 2020 · 25dfa5e · 25dfa5e
2 parents 44232a9 + c5a6244
commit 25dfa5e
Show file tree

Hide file tree

Showing 7 changed files with 420 additions and 61 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -17,9 +17,9 @@ jobs:
         runner-os:
         - ubuntu-latest
         ansible-version:
-        - git+https://github.com/ansible/ansible.git@devel
+        - devel
         runner-python-version:
-        - 3.8
+        - 3.6
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.runner-python-version }}
@@ -37,7 +37,7 @@ jobs:
         pip
         install
         --user
-        ${{ matrix.ansible-version }}
+        https://github.com/ansible/ansible/archive/${{ matrix.ansible-version }}.tar.gz
     - name: Build a collection tarball
       run: >-
         ~/.local/bin/ansible-galaxy
@@ -52,59 +52,59 @@ jobs:
           collection
         path: .cache/collection-tarballs
 
-  # sanity-test-collection-via-containers:
-  #   name: Sanity in container via Python ${{ matrix.python-version }}
-  #   needs:
-  #   - build-collection-artifact
-  #   runs-on: ${{ matrix.runner-os }}
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       runner-os:
-  #       - ubuntu-latest
-  #       runner-python-version:
-  #       - 3.6
-  #       ansible-version:
-  #       - git+https://github.com/ansible/ansible.git@devel
-  #   steps:
-  #   - name: Set up Python ${{ matrix.runner-python-version }}
-  #     uses: actions/setup-python@v1
-  #     with:
-  #       python-version: ${{ matrix.runner-python-version }}
-  #   - name: Set up pip cache
-  #     uses: actions/cache@v1
-  #     with:
-  #       path: ~/.cache/pip
-  #       key: ${{ runner.os }}-pip-${{ github.ref }}-sanity-containers
-  #       restore-keys: |
-  #         ${{ runner.os }}-pip-
-  #         ${{ runner.os }}-
-  #   - name: Install Ansible ${{ matrix.ansible-version }}
-  #     run: >-
-  #       python -m
-  #       pip
-  #       install
-  #       --user
-  #       ${{ matrix.ansible-version }}
-  #   - name: Download migrated collection artifacts
-  #     uses: actions/download-artifact@v1
-  #     with:
-  #       name: >-
-  #         collection
-  #       path: .cache/collection-tarballs
-  #   - name: Install the collection tarball
-  #     run: >-
-  #       ~/.local/bin/ansible-galaxy
-  #       collection
-  #       install
-  #       .cache/collection-tarballs/*.tar.gz
-  #   - name: Run collection sanity tests
-  #     run: >-
-  #       ~/.local/bin/ansible-test
-  #       sanity
-  #       --color
-  #       --requirements
-  #       --docker
-  #       -vvv
-  #     working-directory: >-
-  #       /home/runner/.ansible/collections/ansible_collections/ngine_io/exoscale
+  sanity-test-collection-via-containers:
+    name: Sanity in container via Python ${{ matrix.python-version }}
+    needs:
+    - build-collection-artifact
+    runs-on: ${{ matrix.runner-os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        runner-os:
+        - ubuntu-latest
+        runner-python-version:
+        - 3.6
+        ansible-version:
+        - devel
+    steps:
+    - name: Set up Python ${{ matrix.runner-python-version }}
+      uses: actions/setup-python@v1
+      with:
+        python-version: ${{ matrix.runner-python-version }}
+    - name: Set up pip cache
+      uses: actions/cache@v1
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ github.ref }}-sanity-containers
+        restore-keys: |
+          ${{ runner.os }}-pip-
+          ${{ runner.os }}-
+    - name: Install Ansible ${{ matrix.ansible-version }}
+      run: >-
+        python -m
+        pip
+        install
+        --user
+        https://github.com/ansible/ansible/archive/${{ matrix.ansible-version }}.tar.gz
+    - name: Download migrated collection artifacts
+      uses: actions/download-artifact@v1
+      with:
+        name: >-
+          collection
+        path: .cache/collection-tarballs
+    - name: Install the collection tarball
+      run: >-
+        ~/.local/bin/ansible-galaxy
+        collection
+        install
+        .cache/collection-tarballs/*.tar.gz
+    - name: Run collection sanity tests
+      run: >-
+        ~/.local/bin/ansible-test
+        sanity
+        --color
+        --requirements
+        --docker
+        -vvv
+      working-directory: >-
+        /home/runner/.ansible/collections/ansible_collections/ngine_io/exoscale
diff --git a/plugins/module_utils/exoscale.py b/plugins/module_utils/exoscale.py
@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 # Copyright (c) 2016, René Moser <[email protected]>
 # 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
 

diff --git a/plugins/modules/exo_dns_domain.py b/plugins/modules/exo_dns_domain.py
@@ -15,7 +15,7 @@
 description:
     - Create and remove domain records.
 author: "René Moser (@resmo)"
-version_added: "1.0.0"
+version_added: "0.1.0"
 options:
   name:
     description:

diff --git a/plugins/modules/exo_dns_record.py b/plugins/modules/exo_dns_record.py
@@ -15,7 +15,7 @@
 description:
     - Create, update and delete records.
 author: "René Moser (@resmo)"
-version_added: "1.0.0"
+version_added: "0.1.0"
 options:
   name:
     description:

diff --git a/tests/legacy/exoscale.yml b/tests/legacy/exoscale.yml
@@ -0,0 +1,6 @@
+---
+- hosts: localhost
+  gather_facts: no
+  roles:
+    - role: test_exoscale_dns
+      tags: test_exoscale_dns
diff --git a/tests/legacy/roles/test_exoscale_dns/defaults/main.yml b/tests/legacy/roles/test_exoscale_dns/defaults/main.yml
@@ -0,0 +1,4 @@
+---
+exo_dns_domain_name: example.com
+exo_dns_record_name_web: web
+exo_dns_record_name_mx: mx