remove el6 dockerfiles

packagingbuild/Dockerfile.template

@@ -13,7 +13,7 @@ RUN yum -y install \
     wget
 
 RUN yum -y install \
-    {%- if (version == '7' or version == '6') -%}bzr \{%- endif -%}
+    {%- if (version == '7') -%}bzr \{%- endif -%}
     git \
     mercurial \
     openssh \
@@ -43,7 +43,7 @@ RUN yum -y install \
     gcc-c++ \
     glib2-devel \
     glibc-devel \
-    {%- if (version == '7' or version == '6') -%}
+    {%- if (version == '7') -%}
     ImageMagick \
     ImageMagick-devel \
     {%- endif %}
@@ -55,7 +55,7 @@ RUN yum -y install \
     libwebp-devel \
     libxml2-devel \
     libxslt-devel \
-    {% if (version == '7' or version == '6') -%}
+    {% if (version == '7') -%}
     libyaml-devel \
     {%- endif -%}
     make \
@@ -117,22 +117,7 @@ RUN echo -e "#!/bin/sh\nexit 101\n" > /usr/sbin/policy-rc.d && \
 #   - SSH access for build executor.
 #
 
-{% if version in ('centos6') -%}
-
-RUN yum -y install tar xz rpmdevtools
-
-# Install st2python from our repository
-RUN wget https://bintray.com/stackstorm/el6/rpm -O /etc/yum.repos.d/stackstorm-el6.repo && \
-      sed -ir 's~stackstorm/el6~stackstorm/el6/stable~' /etc/yum.repos.d/stackstorm-el6.repo && \
-      yum -y install st2python && rm -rf /tmp/*
-
-# Install fresh pip and co
-RUN PATH=/usr/share/python/st2python/bin:$PATH bash -c \
-      "curl https://bootstrap.pypa.io/get-pip.py | python - virtualenv==16.6.0 pip==19.1.1 wheel setuptools; \
-        pip install --upgrade requests[security] venvctrl" \
-    && rm -rf /root/.cache
-
-{%- elif dist in ('centos', 'fedora') -%}
+{%- if dist in ('centos', 'fedora') -%}
 
 {% if (version == '8') -%}
 # Install development tools and python3 for EL8
@@ -141,7 +126,7 @@ RUN yum -y install python3 python3-devel rpmdevtools python3-virtualenv && \
 
 RUN pip3 install --upgrade requests[security] venvctrl && rm -rf /root/.cache
 
-{%- elif version in ('7', '6') -%}
+{%- elif version in ('7') -%}
 # Install development tools and python2 for EL <=7
 RUN yum -y install python2 python2-devel rpmdevtools
 

packagingbuild/README.md

@@ -8,7 +8,6 @@ In these containers build environment specific for each OS distro is pre-install
 [`Dockerfiles` sources](https://github.com/StackStorm/st2packaging-dockerfiles/blob/master/packagingbuild):
 - Debian Wheezy
 - Debian Jessie
-- CentOS 6
 - CentOS 7
 - CentOS 8
 - Ubuntu Trusty

packagingtest/Dockerfile.common

@@ -13,7 +13,7 @@ RUN yum -y install \
     wget
 
 RUN yum -y install \
-    {% if (version == '7' or version == '6') -%}bzr \{% endif -%}
+    {% if (version == '7') -%}bzr \{% endif -%}
     git \
     mercurial \
     openssh \
@@ -43,7 +43,7 @@ RUN yum -y install \
     gcc-c++ \
     glib2-devel \
     glibc-devel \
-    {%- if (version == '7' or version == '6') -%}
+    {%- if (version == '7') -%}
     ImageMagick \
     ImageMagick-devel \
     {%- endif %}
@@ -54,7 +54,7 @@ RUN yum -y install \
     libwebp-devel \
     libxml2-devel \
     libxslt-devel \
-    {%- if (version == '7' or version == '6') -%}
+    {%- if (version == '7') -%}
     libyaml-devel \
     {%- endif %}
     make \

packagingtest/Dockerfile.template-systemd

@@ -6,7 +6,7 @@ ENV container docker
 RUN yum -y update; \
     yum -y install systemd; yum clean all
 
-RUN cd /lib/systemd/system/sysinit.target.wants/; ls -1 | grep -v systemd-tmpfiles-setup.service | xargs rm; \ {%- if (version == '6') -%}rm -f /lib/systemd/system/multi-user.target.wants/*; \{%- endif %}
+RUN cd /lib/systemd/system/sysinit.target.wants/; ls -1 | grep -v systemd-tmpfiles-setup.service | xargs rm; \ 
     rm -f /etc/systemd/system/*.wants/*;\
     rm -f /lib/systemd/system/local-fs.target.wants/*; \
     rm -f /lib/systemd/system/sockets.target.wants/*udev*; \

packagingtest/README.md

@@ -8,7 +8,6 @@ In these containers built artifacts are tested: StackStorm packages are installe
 [`Dockerfiles` sources](https://github.com/StackStorm/st2packaging-dockerfiles/blob/master/packagingtest):
 - Debian Wheezy (ssh)
 - Debian Jessie (sshd)
-- CentOS 6 (sshd)
 - CentOS 7 (systemd)
 - CentOS 8 (systemd)
 - Ubuntu Trusty (upstart)