Remove EL6 from st2chatops

.circleci/config.yml

@@ -9,10 +9,10 @@ jobs:
   build:
     machine: true
     working_directory: ~/StackStorm/st2chatops
-    parallelism: 5
+    parallelism: 4
     shell: /bin/bash --login
     environment:
-      DISTROS: xenial bionic el6 el7 el8
+      DISTROS: xenial bionic el7 el8
       ST2_PACKAGES_REPO: https://github.com/StackStorm/st2-packages
       ST2_TEST_ENVIRONMENT: https://github.com/StackStorm/st2-docker
       DEPLOY_PACKAGES: 1
@@ -107,7 +107,7 @@ jobs:
       - image: circleci/ruby:2.4
     working_directory: ~/packages
     environment:
-      DISTROS: "xenial bionic el6 el7 el8"
+      DISTROS: "xenial bionic el7 el8"
     steps:
       - attach_workspace:
           at: /home/circleci

docker-compose.yml

@@ -23,12 +23,6 @@ el7:
     file: docker-compose.override.yml
     service: suite
 
-el6:
-  build: ./packagingenv/centos6
-  extends:
-    file: docker-compose.override.yml
-    service: suite
-
 # Testing environments
 xenial-test:
   build: ./testingenv/xenial
@@ -53,9 +47,3 @@ el7-test:
   extends:
     file: docker-compose.override.yml
     service: suite-test
-
-el6-test:
-  build: ./testingenv/centos6
-  extends:
-    file: docker-compose.override.yml
-    service: suite-test

packagingenv/Dockerfile.template

@@ -4,17 +4,6 @@ FROM {{ dist }}:{{ version }}
 
 RUN yum -y install gcc-c++ make git libicu-devel rpmdevtools
 
-{%- if version in ('centos6') %}
-
-RUN wget http://people.centos.org/tru/devtools-2/devtools-2.repo -O /etc/yum.repos.d/devtools-2.repo && \
-    yum -y install devtoolset-2-gcc devtoolset-2-binutils devtoolset-2-gcc-c++
-
-ENV CC  /opt/rh/devtoolset-2/root/usr/bin/gcc
-ENV CPP /opt/rh/devtoolset-2/root/usr/bin/cpp
-ENV CXX /opt/rh/devtoolset-2/root/usr/bin/c++
-
-{%- endif %}
-
 # Add NodeSource repo
 RUN curl --silent --location https://rpm.nodesource.com/setup_10.x | bash -
 

rpm/st2chatops.spec

@@ -38,10 +38,6 @@ Requires: /usr/bin/env
           done \
 %{nil}
 
-%if 0%{?_unitdir:1}
-  %define use_systemd 1
-%endif
-
 
 %description
   Package providing StackStorm ChatOps functionality: bundled, tested and ready to use Hubot
@@ -57,11 +53,7 @@ Requires: /usr/bin/env
 %install
   %debian_dirs
   %make_install
-%if 0%{?use_systemd}
   install -D -p -m0644 %{_builddir}/rpm/st2chatops.service %{buildroot}%{_unitdir}/st2chatops.service
-%else
-  install -D -p -m0755 %{_builddir}/rpm/st2chatops.init %{buildroot}%{_sysconfdir}/rc.d/init.d/st2chatops
-%endif
 
 %clean
   rm -rf %{buildroot}
@@ -73,11 +65,7 @@ Requires: /usr/bin/env
   /opt/stackstorm/chatops/*
   %attr(755, st2, root) %{_localstatedir}/log/st2
   %config(noreplace) %{_sysconfdir}/logrotate.d/st2chatops
-%if 0%{?use_systemd}
   %{_unitdir}/st2chatops.service
-%else
-  %{_sysconfdir}/rc.d/init.d/st2chatops
-%endif
 
 %config(noreplace) /opt/stackstorm/chatops/st2chatops.env
 %config(noreplace) /opt/stackstorm/chatops/external-scripts.json