Merge branch 'release/v0.8.0'

Author: Suszyński Krzysztof

Diff for: MANIFEST.in

@@ -1,6 +1,9 @@
 # Include the license file
 include LICENSE
 
+# Include automated install scripts
+include setup.sh
+
 # Include the data files
 recursive-include puppeter *.py
 recursive-include puppeter *.pyi

Diff for: README.rst

@@ -15,4 +15,32 @@ Puppeter - an automatic puppet installer
 
 A commandline tool to ease the installation of typical puppetserver - agent installation. It uses a interactive mode and batch mode as well. Batch mode utilizes a answer files for full automatic operation.
 
+Installation
+------------
+
+To install Puppeter simple use PIP:
+
+.. code-block:: bash
+
+  pip install puppeter
+
+If you like to install puppeter on clean operating system with automatic installer execute:
+
+.. code-block:: bash
+
+  curl https://raw.githubusercontent.com/coi-gov-pl/puppeter/master/setup.sh | bash
+
+It will install PIP and compatibile Python (2.7+)
+
+The installer script is supported for:
+
+* Debian 8
+* Debian 9
+* Ubuntu 14.04
+* Ubuntu 16.04
+* CentOS 6
+* CentOS 7
+* OracleLinux 6
+* OracleLinux 7
+
 **TODO: Write more later**

Diff for: integration_tests/acceptance.py

@@ -28,6 +28,6 @@ def run_puppeter(self, answers):
         assert exitcode == 0
 
     def __script(self, script, arg=''):
-        command = 'bash -e %s/integration_tests/scripts/%s %s' % (remote_dir, script, arg)
+        command = 'bash -leo pipefail %s/integration_tests/scripts/%s %s' % (remote_dir, script, arg)
         exitcode, out, err = self.__phial.exec(command.strip())
         return exitcode

Diff for: integration_tests/answers/simple-pc3x.yml renamed to integration_tests/answers/agent-pc3x.yml

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

Diff for: integration_tests/answers/simple-pc4x.yml renamed to integration_tests/answers/agent-pc4x.yml

@@ -139,8 +139,8 @@ def err(self, data):
 
     class CaptureOutputHandler(OutputHandler):
         def __init__(self):
-            self.outbuf = ''
-            self.errbuf = ''
+            self.outbuf = b''
+            self.errbuf = b''
 
         def out(self, data):
             self.outbuf += data
@@ -149,10 +149,10 @@ def err(self, data):
             self.errbuf += data
 
         def collected_output(self):
-            return self.outbuf
+            return self.outbuf.decode(errors='ignore')
 
         def collected_error_output(self):
-            return self.errbuf
+            return self.errbuf.decode(errors='ignore')
 
     class PrintOutputHandler(OutputHandler):
         def __init__(self):
@@ -183,35 +183,37 @@ def read_all(self):
 
         def read_chunk(self, size=32):
             if self.__channel.recv_stderr_ready():
-                data = self.__channel.recv_stderr(size).decode(errors="ignore")
+                data = self.__channel.recv_stderr(size)
                 self.__handler.err(data)
             if self.__channel.recv_ready():
-                data = self.__channel.recv(size).decode(errors="ignore")
+                data = self.__channel.recv(size)
                 self.__handler.out(data)
 
     class OutputBuffer:
         def __init__(self):
-            self.buf = ''
+            self.buf = b''
 
         def recv(self, data):
             self.buf += data
 
         def lines_collected(self):
             # type: () -> Sequence[str]
-            splited = self.buf.splitlines(keepends=True)
+            splited = self.buf\
+                .decode(errors='ignore')\
+                .splitlines(keepends=True)
             collected = []
             newbuf = ''
             for line in splited:
                 if line.endswith(('\n', '\r\n')):
                     collected.append(line.rstrip())
                 else:
                     newbuf += line
-            self.buf = newbuf
+            self.buf = newbuf.encode()
             return collected
 
     def _bashify(self, command):
         filtered = command.replace("'", "\\'")
-        return "bash -lc '{command}'".format(command=filtered)
+        return "bash -leo pipefail -c '{command}'".format(command=filtered)
 
 
 @pytest.fixture
@@ -249,7 +251,7 @@ def execute(command, success_codes=(0,)):
         output = error.output or b''
         status = error.returncode
         command = error.cmd
-    output = output.decode('utf-8')
+    output = output.decode(errors='ignore')
     if status not in success_codes:
         raise Exception(
             'Command %r returned %d: """%s""".' % (command, status, output)
@@ -267,15 +269,15 @@ def execute_streaming(command, success_codes=(0,)):
     while True:
         retcode = p.poll()
         if retcode is not None:
-            handler.err(p.stderr.read().decode(errors='ignore'))
-            handler.out(p.stdout.read().decode(errors='ignore'))
+            handler.err(p.stderr.read())
+            handler.out(p.stdout.read())
             break
         while len(select.select([p.stderr], [], [], 0)[0]) == 1:
-            contents = p.stderr.read(1).decode(errors='ignore')
-            handler.err(contents)
+            data = p.stderr.read(1)
+            handler.err(data)
         while len(select.select([p.stdout], [], [], 0)[0]) == 1:
-            contents = p.stdout.read(1).decode(errors='ignore')
-            handler.out(contents)
+            data = p.stdout.read(1)
+            handler.out(data)
         time.sleep(0.01)
     if retcode not in success_codes:
         raise Exception(

Diff for: integration_tests/answers/simple-pc5x.yml renamed to integration_tests/answers/agent-pc5x.yml

@@ -1,6 +1,6 @@
 FROM debian:8
 
-RUN apt-get update && apt-get install -y openssh-server python-pip python-dev
+RUN apt-get update && apt-get install -y openssh-server
 RUN mkdir /var/run/sshd
 RUN echo 'root:phial' | chpasswd
 RUN sed -i 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_config
@@ -11,5 +11,10 @@ RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so
 ENV NOTVISIBLE "in users profile"
 RUN echo "export VISIBLE=now" >> /etc/profile
 
+COPY ./setup.sh /puppeter-setup.sh
+RUN chmod +x /puppeter-setup.sh
+ENV MODE dependencies
+RUN /puppeter-setup.sh
+
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]

Diff for: integration_tests/answers/agent-system.yml

@@ -2,6 +2,8 @@
 version: '3'
 services:
   sut:
-    build: ./
+    build:
+      context: ../../../..
+      dockerfile: integration_tests/system-under-tests/debian/debian-8/Dockerfile
     ports:
       - 22

Diff for: integration_tests/phial.py

@@ -1,6 +1,6 @@
 FROM debian:9
 
-RUN apt-get update && apt-get install -y openssh-server python-pip
+RUN apt-get update && apt-get install -y openssh-server
 RUN mkdir /var/run/sshd
 RUN echo 'root:phial' | chpasswd
 RUN sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
@@ -11,5 +11,10 @@ RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so
 ENV NOTVISIBLE "in users profile"
 RUN echo "export VISIBLE=now" >> /etc/profile
 
+COPY ./setup.sh /puppeter-setup.sh
+RUN chmod +x /puppeter-setup.sh
+ENV MODE dependencies
+RUN /puppeter-setup.sh
+
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]

Diff for: integration_tests/system-under-tests/debian/debian-8/Dockerfile

@@ -2,6 +2,8 @@
 version: '3'
 services:
   sut:
-    build: ./
+    build:
+      context: ../../../..
+      dockerfile: integration_tests/system-under-tests/debian/debian-9/Dockerfile
     ports:
       - 22

Diff for: integration_tests/system-under-tests/debian/debian-8/docker-compose.yml

@@ -1,6 +1,6 @@
 FROM ubuntu:14.04
 
-RUN apt-get update && apt-get install -y openssh-server python-pip python-dev
+RUN apt-get update && apt-get install -y openssh-server
 RUN mkdir /var/run/sshd
 RUN echo 'root:phial' | chpasswd
 RUN sed -i 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_config
@@ -11,5 +11,10 @@ RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so
 ENV NOTVISIBLE "in users profile"
 RUN echo "export VISIBLE=now" >> /etc/profile
 
+COPY ./setup.sh /puppeter-setup.sh
+RUN chmod +x /puppeter-setup.sh
+ENV MODE dependencies
+RUN /puppeter-setup.sh
+
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]

Diff for: integration_tests/system-under-tests/debian/debian-9/Dockerfile

@@ -2,6 +2,8 @@
 version: '3'
 services:
   sut:
-    build: ./
+    build:
+      context: ../../../..
+      dockerfile: integration_tests/system-under-tests/debian/ubuntu-1404/Dockerfile
     ports:
       - 22

Diff for: integration_tests/system-under-tests/debian/debian-9/docker-compose.yml

@@ -1,6 +1,6 @@
 FROM ubuntu:16.04
 
-RUN apt-get update && apt-get install -y openssh-server python-pip
+RUN apt-get update && apt-get install -y openssh-server
 RUN mkdir /var/run/sshd
 RUN echo 'root:phial' | chpasswd
 RUN sed -i 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
@@ -11,5 +11,10 @@ RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so
 ENV NOTVISIBLE "in users profile"
 RUN echo "export VISIBLE=now" >> /etc/profile
 
+COPY ./setup.sh /puppeter-setup.sh
+RUN chmod +x /puppeter-setup.sh
+ENV MODE dependencies
+RUN /puppeter-setup.sh
+
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]

Diff for: integration_tests/system-under-tests/debian/ubuntu-1404/Dockerfile

@@ -2,6 +2,8 @@
 version: '3'
 services:
   sut:
-    build: ./
+    build:
+      context: ../../../..
+      dockerfile: integration_tests/system-under-tests/debian/ubuntu-1604/Dockerfile
     ports:
       - 22

Diff for: integration_tests/system-under-tests/debian/ubuntu-1404/docker-compose.yml

@@ -1,9 +1,6 @@
 FROM centos:6
 
-RUN yum install -y centos-release-scl
-RUN yum install -y openssh-server python27-python-pip
-ADD enablepython27.sh /etc/profile.d/enablepython27.sh
-
+RUN yum install -y openssh-server
 RUN mkdir /var/run/sshd
 RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
 RUN echo 'root:phial' | chpasswd
@@ -15,5 +12,10 @@ RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so
 ENV NOTVISIBLE "in users profile"
 RUN echo "export VISIBLE=now" >> /etc/profile
 
+COPY ./setup.sh /puppeter-setup.sh
+RUN chmod +x /puppeter-setup.sh
+ENV MODE dependencies
+RUN /puppeter-setup.sh
+
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]

Diff for: integration_tests/system-under-tests/debian/ubuntu-1604/Dockerfile

@@ -2,6 +2,8 @@
 version: '3'
 services:
   sut:
-    build: ./
+    build:
+      context: ../../../..
+      dockerfile: integration_tests/system-under-tests/redhat/centos-6/Dockerfile
     ports:
       - 22

Diff for: integration_tests/system-under-tests/debian/ubuntu-1604/docker-compose.yml

@@ -1,7 +1,6 @@
 FROM centos:7
 
-RUN yum install -y epel-release
-RUN yum install -y openssh-server python-pip
+RUN yum install -y openssh-server
 RUN mkdir /var/run/sshd
 RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
 RUN echo 'root:phial' | chpasswd
@@ -13,5 +12,10 @@ RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so
 ENV NOTVISIBLE "in users profile"
 RUN echo "export VISIBLE=now" >> /etc/profile
 
+COPY ./setup.sh /puppeter-setup.sh
+RUN chmod +x /puppeter-setup.sh
+ENV MODE dependencies
+RUN /puppeter-setup.sh
+
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]

Diff for: integration_tests/system-under-tests/redhat/centos-6/Dockerfile

@@ -2,6 +2,8 @@
 version: '3'
 services:
   sut:
-    build: ./
+    build:
+      context: ../../../..
+      dockerfile: integration_tests/system-under-tests/redhat/centos-7/Dockerfile
     ports:
       - 22

Diff for: integration_tests/system-under-tests/redhat/centos-6/docker-compose.yml

@@ -1,9 +1,6 @@
 FROM oraclelinux:6
 
-RUN yum-config-manager --enable public_ol6_software_collections
-RUN yum install -y openssh-server python27-python-pip
-ADD enablepython27.sh /etc/profile.d/enablepython27.sh
-
+RUN yum install -y openssh-server
 RUN mkdir /var/run/sshd
 RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
 RUN echo 'root:phial' | chpasswd
@@ -15,5 +12,10 @@ RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so
 ENV NOTVISIBLE "in users profile"
 RUN echo "export VISIBLE=now" >> /etc/profile
 
+COPY ./setup.sh /puppeter-setup.sh
+RUN chmod +x /puppeter-setup.sh
+ENV MODE dependencies
+RUN /puppeter-setup.sh
+
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]

Diff for: integration_tests/system-under-tests/redhat/centos-6/enablepython27.sh

@@ -2,6 +2,8 @@
 version: '3'
 services:
   sut:
-    build: ./
+    build:
+      context: ../../../..
+      dockerfile: integration_tests/system-under-tests/redhat/oraclelinux-6/Dockerfile
     ports:
       - 22

Diff for: integration_tests/system-under-tests/redhat/centos-7/Dockerfile

@@ -1,7 +1,6 @@
 FROM oraclelinux:7
 
-RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-RUN yum install -y openssh-server python-pip
+RUN yum install -y openssh-server
 RUN mkdir /var/run/sshd
 RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
 RUN echo 'root:phial' | chpasswd
@@ -15,5 +14,10 @@ RUN echo "export VISIBLE=now" >> /etc/profile
 
 ENV LANG en_US.UTF-8
 
+COPY ./setup.sh /puppeter-setup.sh
+RUN chmod +x /puppeter-setup.sh
+ENV MODE dependencies
+RUN /puppeter-setup.sh
+
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]

Diff for: integration_tests/system-under-tests/redhat/centos-7/docker-compose.yml

@@ -2,6 +2,8 @@
 version: '3'
 services:
   sut:
-    build: ./
+    build:
+      context: ../../../..
+      dockerfile: integration_tests/system-under-tests/redhat/oraclelinux-7/Dockerfile
     ports:
       - 22