Remove EL6 from the scripted installer, stop CircleCI builds

.circleci/config.yml

@@ -8,7 +8,7 @@ version: 2
 jobs:
   # Build & Test st2 & st2mistral packages
   packages:
-    parallelism: 5
+    parallelism: 4
     # 4CPUs & 8GB RAM CircleCI machine
     # sadly, it doesn't work with 'setup_remote_docker'
     resource_class: large
@@ -17,7 +17,7 @@ jobs:
       - image: circleci/python:2.7
     working_directory: ~/st2-packages
     environment:
-      DISTROS: "xenial bionic el6 el7 el8"
+      DISTROS: "xenial bionic el7 el8"
       BASH_ENV: ~/.buildenv
       # These should be set to an empty string, so that st2cd prep tasks are able to replace these
       # with real gitrevs during releases. Note that they are commented out, so that they do not interfere
@@ -124,7 +124,7 @@ jobs:
       - image: circleci/ruby:2.4
     working_directory: /tmp/deploy
     environment:
-      - DISTROS: "xenial bionic el6 el7 el8"
+      - DISTROS: "xenial bionic el7 el8"
     steps:
       - attach_workspace:
           at: .

Makefile

@@ -13,14 +13,12 @@ scriptsgen:
 
 	# 1. Sample config - conf/st2.conf.sample
 	cp scripts/st2bootstrap-deb.sh /tmp/st2bootstrap-deb.sh.upstream
-	cp scripts/st2bootstrap-el6.sh /tmp/st2bootstrap-el6.sh.upstream
 	cp scripts/st2bootstrap-el7.sh /tmp/st2bootstrap-el7.sh.upstream
 	cp scripts/st2bootstrap-el8.sh /tmp/st2bootstrap-el8.sh.upstream
 
 	make scriptsgen
 
 	diff scripts/st2bootstrap-deb.sh /tmp/st2bootstrap-deb.sh.upstream || (echo "scripts/st2bootstrap-deb.sh hasn't been re-generated and committed. Please run \"make scriptsgen\" and include and commit the generated file." && exit 1)
-	diff scripts/st2bootstrap-el6.sh /tmp/st2bootstrap-el6.sh.upstream || (echo "scripts/st2bootstrap-el6.sh hasn't been re-generated and committed. Please run \"make scriptsgen\" and include and commit the generated file." && exit 1)
 	diff scripts/st2bootstrap-el7.sh /tmp/st2bootstrap-el7.sh.upstream || (echo "scripts/st2bootstrap-el7.sh hasn't been re-generated and committed. Please run \"make scriptsgen\" and include and commit the generated file." && exit 1)
 	diff scripts/st2bootstrap-el8.sh /tmp/st2bootstrap-el8.sh.upstream || (echo "scripts/st2bootstrap-el8.sh hasn't been re-generated and committed. Please run \"make scriptsgen\" and include and commit the generated file." && exit 1)
 

README.md

@@ -15,7 +15,7 @@
 Packages build environment is a *multi-container docker* application defined and managed with [docker-compose](https://github.com/docker/compose). It consists of four types of containers:
 
  - **Packaging runner** (https://quay.io/stackstorm/packagingrunner) - the main entry point, package build and test processing controller container.
- - **Packaging build** (https://hub.docker.com/r/stackstorm/packagingbuild/) - container where actual `.deb`/`.rpm` artifacts build takes place. It's used to bring up the build environment specific for OS distro. This means that different containers are available such as *packagingbuild:centos6*, *packagingbuild:xenial* correspondingly for CentOS 6 and Ubuntu Xenial.
+ - **Packaging build** (https://hub.docker.com/r/stackstorm/packagingbuild/) - container where actual `.deb`/`.rpm` artifacts build takes place. It's used to bring up the build environment specific for OS distro. This means that different containers are available such as *packagingbuild:centos7*, *packagingbuild:xenial* correspondingly for CentOS 7 and Ubuntu Xenial.
  - **Packaging test** (https://hub.docker.com/r/stackstorm/packagingtest/) - containers where built artifacts are tested, i.e. *artifacts are installed, configuration is written and tests are performed*.
  - **Services** - these are different containers required for testing such as *rabbitmq, mongodb and postgresql*
 
@@ -72,8 +72,7 @@ In order to build, package, install and test ST2 in an isolated Vagrant VM, run
 vagrant up $TARGET
 ```
 
-Where `$TARGET` is one of `xenial`, `bionic`, `el7`, or `el8`. Note that `el6` does not reliably
- support docker, so it is not an available option. If you are using `el8`, comment out the 
+Where `$TARGET` is one of `xenial`, `bionic`, `el7`, or `el8`. If you are using `el8`, comment out the 
  `vm_config.vm.provision :docker` line in the Vagrantfile. There is logic in `setup-vagrant.sh` to 
  install docker in `el8`.
 
@@ -105,7 +104,6 @@ are `st2admin` and `Ch@ngeMe` respectively.
 Current community packages are hosted on https://packagecloud.io/StackStorm. For detailed instructions how install st2 and perform basic configuration follow these instructions:
 - [Ubuntu/Debian](https://docs.stackstorm.com/install/deb.html)
 - [RHEL7/CentOS7](https://docs.stackstorm.com/install/rhel7.html)
-- [RHEL6/CentOS6](https://docs.stackstorm.com/install/rhel6.html)
 
 ## Adding Support For a New Distribution
 

docker-compose.circle.yml

@@ -60,19 +60,6 @@ el7:
     - centos7build
     - centos7test
 
-el6:
-  image: quay.io/stackstorm/packagingrunner
-  extends:
-    file: docker-compose.override.yml
-    service: suite-circle
-  environment:
-    - ST2_PYTHON=1
-    - BUILDNODE=centos6build
-    - TESTNODE=centos6test
-  links:
-    - centos6build
-    - centos6test
-
 ## Package build nodes
 #
 xenialbuild:
@@ -86,12 +73,6 @@ bionicbuild:
   volumes_from:
     - st2-packages-vol
 
-centos6build:
-  image: stackstorm/packagingbuild:centos6
-  extends:
-    file: docker-compose.override.yml
-    service: volumes-circle
-
 centos7build:
   image: stackstorm/packagingbuild:centos7
   extends:
@@ -123,12 +104,6 @@ bionictest:
   volumes:
     - /sys/fs/cgroup:/sys/fs/cgroup:ro
 
-centos6test:
-  image: stackstorm/packagingtest:centos6-sshd
-  extends:
-    file: docker-compose.override.yml
-    service: volumes-circle
-
 centos7test:
   image: stackstorm/packagingtest:centos7-systemd
   extends:

docker-compose.circle2.yml

@@ -62,22 +62,6 @@ el7:
     - mongodb
     - postgres
 
-el6:
-  image: quay.io/stackstorm/packagingrunner
-  working_dir: /root/st2-packages
-  volumes_from:
-    - st2-packages-vol
-  environment:
-    - ST2_PYTHON=1
-    - BUILDNODE=centos6build
-    - TESTNODE=centos6test
-  links:
-    - centos6build
-    - centos6test
-    - rabbitmq
-    - mongodb
-    - postgres
-
 ## Package build nodes
 #
 xenialbuild:
@@ -90,11 +74,6 @@ bionicbuild:
   volumes_from:
     - st2-packages-vol
 
-centos6build:
-  image: stackstorm/packagingbuild:centos6
-  volumes_from:
-    - st2-packages-vol
-
 centos7build:
   image: stackstorm/packagingbuild:centos7
   volumes_from:
@@ -123,11 +102,6 @@ bionictest:
   volumes:
     - /sys/fs/cgroup:/sys/fs/cgroup:ro
 
-centos6test:
-  image: stackstorm/packagingtest:centos6-sshd
-  volumes_from:
-    - st2-packages-vol
-
 centos7test:
   image: stackstorm/packagingtest:centos7-systemd
   privileged: true

docker-compose.yml

@@ -67,22 +67,6 @@ el7:
     - mongodb
     - postgres
 
-el6:
-  image: quay.io/stackstorm/packagingrunner
-  extends:
-    file: docker-compose.override.yml
-    service: suite-compose
-  environment:
-    - ST2_PYTHON=1
-    - BUILDNODE=centos6build
-    - TESTNODE=centos6test
-  links:
-    - centos6build
-    - centos6test
-    - rabbitmq
-    - mongodb
-    - postgres
-
 ## Package build nodes
 #
 xenialbuild:
@@ -97,12 +81,6 @@ bionicbuild:
     file: docker-compose.override.yml
     service: volumes-compose
 
-centos6build:
-  image: stackstorm/packagingbuild:centos6
-  extends:
-    file: docker-compose.override.yml
-    service: volumes-compose
-
 centos7build:
   image: stackstorm/packagingbuild:centos7
   extends:
@@ -135,12 +113,6 @@ bionictest:
   volumes:
     - /sys/fs/cgroup:/sys/fs/cgroup:ro
 
-centos6test:
-  image: stackstorm/packagingtest:centos6-sshd
-  extends:
-    file: docker-compose.override.yml
-    service: volumes-compose
-
 centos7test:
   image: stackstorm/packagingtest:centos7-systemd
   privileged: true

scripts/includes/common.sh

@@ -30,7 +30,7 @@ function configure_proxy() {
 function get_package_url() {
   # Retrieve direct package URL for the provided dev build, subtype and package name regex.
   DEV_BUILD=$1 # Repo name and build number - <repo name>/<build_num> (e.g. st2/5646)
-  DISTRO=$2  # Distro name (e.g. xenial,bionic,el6,el7)
+  DISTRO=$2  # Distro name (e.g. xenial,bionic,el7,el8)
   PACKAGE_NAME_REGEX=$3
 
   PACKAGES_METADATA=$(curl -sSL -q https://circleci.com/api/v1.1/project/github/StackStorm/${DEV_BUILD}/artifacts)

scripts/st2_bootstrap.sh

@@ -152,7 +152,7 @@ if [[ -n "$RHTEST" ]]; then
   echo "*** Detected Distro is ${RHTEST} ***"
   RHMAJVER=`cat /etc/redhat-release | sed 's/[^0-9.]*\([0-9.]\).*/\1/'`
   echo "*** Detected distro version ${RHMAJVER} ***"
-  if [[ "$RHMAJVER" != '6' && "$RHMAJVER" != '7' && "$RHMAJVER" != '8' ]]; then
+  if [[ "$RHMAJVER" != '7' && "$RHMAJVER" != '8' ]]; then
     echo "Unsupported distro version $RHMAJVER! Aborting!"
     exit 2
   fi

scripts/st2bootstrap-deb.sh

@@ -148,7 +148,7 @@ function configure_proxy() {
 function get_package_url() {
   # Retrieve direct package URL for the provided dev build, subtype and package name regex.
   DEV_BUILD=$1 # Repo name and build number - <repo name>/<build_num> (e.g. st2/5646)
-  DISTRO=$2  # Distro name (e.g. xenial,bionic,el6,el7)
+  DISTRO=$2  # Distro name (e.g. xenial,bionic,el7,el8)
   PACKAGE_NAME_REGEX=$3
 
   PACKAGES_METADATA=$(curl -sSL -q https://circleci.com/api/v1.1/project/github/StackStorm/${DEV_BUILD}/artifacts)