Merge branch 'release/v0.7.0'

Author: cardil

Diff for: .circleci/config.yml

@@ -0,0 +1,127 @@
+# Python CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-python/ for more details
+version: 2
+
+references:
+  machine-defaults: &environment-defaults
+    machine: true
+  install-docker-compose: &install-docker-compose
+    run:
+      name: Install Docker Compose
+      command: |
+        sudo curl -L https://github.com/docker/compose/releases/download/1.19.0/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
+        sudo chmod +x /usr/local/bin/docker-compose
+  intall-python-versions: &intall-python-versions
+    run:
+      name: Install required Python versions
+      shell: /bin/bash -leo pipefail
+      command: |
+        cd ~/project
+        for ver in $(cat .python-version); do
+          pyenv install -sv $ver &
+        done
+        wait
+  install-tox: &install-tox
+    run:
+      name: Install Tox
+      command: sudo pip install tox
+  restore-cache-dependencies: &restore-cache-dependencies
+    # Download and cache dependencies
+    restore_cache:
+      keys:
+        - v2-dependencies-{{ checksum "tox.ini" }}
+  save-cache-dependencies: &save-cache-dependencies
+    save_cache:
+      paths:
+       - ./tox
+      key: v2-dependencies-{{ checksum "tox.ini" }}
+  restore-cache-pyenv: &restore-cache-pyenv
+    restore_cache:
+      keys:
+        - v2-pyenv-{{ checksum ".python-version" }}
+  save-cache-pyenv: &save-cache-pyenv
+    save_cache:
+      paths:
+       - /opt/circleci/.pyenv/versions
+      key: v2-pyenv-{{ checksum ".python-version" }}
+
+  fetch-dependencies-via-tox: &fetch-dependencies-via-tox
+    run:
+      name: Fetch dependencies via Tox
+      shell: /bin/bash -leo pipefail
+      command: tox -e phial --notest
+  phial: &phial
+    run:
+      name: Run integration tests using Phial
+      shell: /bin/bash -leo pipefail
+      command: tox -e phial -- -m $GROUP
+
+  steps: &steps
+    steps:
+      - checkout
+      - *install-docker-compose
+      - *restore-cache-pyenv
+      - *intall-python-versions
+      - *save-cache-pyenv
+      - *install-tox
+      - *restore-cache-dependencies
+      - *fetch-dependencies-via-tox
+      - *save-cache-dependencies
+      - *phial
+
+
+workflows:
+  version: 2
+  integration-tests:
+    jobs:
+      - centos-6
+      - centos-7
+      - oraclelinux-6
+      - oraclelinux-7
+      - debian-8
+      - debian-9
+      - ubuntu-1404
+      - ubuntu-1604
+
+jobs:
+  centos-6:
+    <<: *environment-defaults
+    <<: *steps
+    environment:
+      GROUP: centos6
+  centos-7:
+    <<: *environment-defaults
+    <<: *steps
+    environment:
+      GROUP: centos7
+  oraclelinux-6:
+    <<: *environment-defaults
+    <<: *steps
+    environment:
+      GROUP: oraclelinux6
+  oraclelinux-7:
+    <<: *environment-defaults
+    <<: *steps
+    environment:
+      GROUP: oraclelinux7
+  ubuntu-1404:
+    <<: *environment-defaults
+    <<: *steps
+    environment:
+      GROUP: ubuntu1404
+  ubuntu-1604:
+    <<: *environment-defaults
+    <<: *steps
+    environment:
+      GROUP: ubuntu1604
+  debian-8:
+    <<: *environment-defaults
+    <<: *steps
+    environment:
+      GROUP: debian8
+  debian-9:
+    <<: *environment-defaults
+    <<: *steps
+    environment:
+      GROUP: debian9

Diff for: .gitignore

@@ -2,6 +2,7 @@
 __pycache__/
 *.py[cod]
 *$py.class
+.pytest_cache
 
 # C extensions
 *.so

Diff for: MANIFEST.in

@@ -7,3 +7,11 @@ recursive-include puppeter *.pyi
 recursive-include puppeter *.sh
 recursive-include puppeter *.pp
 
+# Include integration tests sources
+recursive-include integration_tests *.py
+recursive-include integration_tests *.sh
+recursive-include integration_tests *.yml
+recursive-include integration_tests */Dockerfile
+
+# Exclude environment files
+prune .circleci

Diff for: README.rst

@@ -5,6 +5,8 @@ Puppeter - an automatic puppet installer
 
 .. image:: https://travis-ci.org/coi-gov-pl/puppeter.svg?branch=develop
     :target: https://travis-ci.org/coi-gov-pl/puppeter
+.. image:: https://circleci.com/gh/coi-gov-pl/puppeter.svg?style=svg
+    :target: https://circleci.com/gh/coi-gov-pl/puppeter
 .. image:: https://coveralls.io/repos/github/coi-gov-pl/puppeter/badge.svg?branch=feature%2Finstall-puppet-agent
     :target: https://coveralls.io/github/coi-gov-pl/puppeter?branch=feature%2Finstall-puppet-agent
 .. image:: https://img.shields.io/pypi/v/puppeter.svg

Diff for: integration_tests/__init__.py

@@ -0,0 +1,33 @@
+import re
+from os.path import dirname
+
+puppeter_source = dirname(dirname(__file__))
+remote_dir = '/usr/src/puppeter-source'
+
+
+class PuppeterAcceptance:
+
+    PUPPET_VER_3 = re.compile('^3\.\d+\.\d+$')
+    PUPPET_VER_4 = re.compile('^4\.\d+\.\d+$')
+    PUPPET_VER_5 = re.compile('^5\.\d+\.\d+$')
+
+    def __init__(self, phial):
+        self.__phial = phial
+
+    def install_puppeter(self):
+        self.__phial.scp(puppeter_source, remote_dir)
+
+        exitcode = self.__script('install-develop.sh')
+
+        assert exitcode == 0
+
+    def run_puppeter(self, answers):
+        answersfile = '%s/integration_tests/answers/%s' % (remote_dir, answers)
+        exitcode = self.__script('execute.sh', answersfile)
+
+        assert exitcode == 0
+
+    def __script(self, script, arg=''):
+        command = 'bash -e %s/integration_tests/scripts/%s %s' % (remote_dir, script, arg)
+        exitcode, out, err = self.__phial.exec(command.strip())
+        return exitcode

Diff for: integration_tests/acceptance.py

@@ -0,0 +1,3 @@
+installer:
+  mode: Agent
+  type: pc3x

Diff for: integration_tests/answers/simple-pc3x.yml

@@ -0,0 +1,3 @@
+installer:
+  mode: Agent
+  type: pc4x

Diff for: integration_tests/answers/simple-pc4x.yml

@@ -0,0 +1,3 @@
+installer:
+  mode: Agent
+  type: pc5x

Diff for: integration_tests/answers/simple-pc5x.yml

@@ -0,0 +1,49 @@
+import pytest
+
+from integration_tests.phial import Phial, \
+    ssh_service, \
+    docker_ip, \
+    docker_services, \
+    docker_compose_file, \
+    docker_compose_project_name, \
+    docker_allow_fallback
+
+__fixtures = [
+    ssh_service,
+    docker_ip,
+    docker_services,
+    docker_compose_file,
+    docker_compose_project_name,
+    docker_allow_fallback
+]
+
+
+@pytest.fixture
+def phial(ssh_service):
+    return Phial(ssh_service)
+
+
+@pytest.fixture
+def regex():
+    return Regex()
+
+
+class Regex:
+    def __init__(self):
+        import re
+        self.re = re.compile('^$')
+
+    def pattern(self, re):
+        # type: (str) -> Regex
+        self.re = re
+        return self
+
+    def matches(self, text, strip=True):
+        __tracebackhide__ = True
+        if strip:
+            testable = text.strip()
+        else:
+            testable = text
+        if self.re.match(testable) is None:
+            pytest.fail("regex of '{regex}' do not match given text {text}"
+                        .format(text=repr(testable), regex=self.re.pattern))