Merge pull request #439 from amanda11/remove_el6

Deprecate RHEL 6 / CentOS 6

CHANGES.md

@@ -1,3 +1,7 @@
+## 0.1.2 
+
+Removed EL6 and added EL8
+
 ## 0.1.1 
 
 Disabled rules that report VM provision/destroy messages

CHECKLIST.md

@@ -17,12 +17,12 @@ A list of planned features—different for every release, of course–should fol
 
 ## 3. Pre-release procedure
 
-- [ ] Test every feature manually in CentOS/RHEL 6.
 - [ ] Test every feature manually in CentOS/RHEL 7.
+- [ ] Test every feature manually in CentOS/RHEL 8.
 - [ ] Test every feature manually in Ubuntu 16.
 - [ ] Test every feature manually in Ubuntu 18.
-- [ ] Ask someone else to test every feature manually in CentOS/RHEL 6.
 - [ ] Ask someone else to test every feature manually in CentOS/RHEL 7.
+- [ ] Ask someone else to test every feature manually in CentOS/RHEL 8.
 - [ ] Ask someone else to test every feature manually in Ubuntu 16.
 - [ ] Ask someone else to test every feature manually in Ubuntu 18.
 - [ ] If something failed, fix and repeat from the beginning.
@@ -47,7 +47,7 @@ st2 key set st2_stable_version 1.2
 st2 key set st2_unstable_version 1.3dev
 st2 key set st2_master_build_number 1
 ```
-- [ ] Make sure packaging is completed for st2web, st2flow, Mistral, and st2 itself (x4: Ubuntu 16.04, Ubuntu 18.04, RHEL6, RHEL7).
+- [ ] Make sure packaging is completed for st2web, st2flow, Mistral, and st2 itself (x4: Ubuntu 16.04, Ubuntu 18.04, RHEL7, RHEL8).
 - [ ] Make sure `pytests` are passing and no sudden upstream issues happened (hi, oslo.utils!).
 - [ ] Create a temporary version tag say v1.3.0 if releasing v1.3.0 so that st2workroom_test passes. Also, remove tag before finalize.
 - [ ] Run `st2cd.package-publish-release` to push the packages to the download server and finalize the release.
@@ -62,12 +62,12 @@ st2 key set st2_master_build_number 1
 - [ ] Announce to the team that the code is out, bathe in fame and glory.
 - [ ] Test every feature manually in Ubuntu 16.
 - [ ] Test every feature manually in Ubuntu 18.
-- [ ] Test every feature manually in CentOS/RHEL 6.
 - [ ] Test every feature manually in CentOS/RHEL 7.
+- [ ] Test every feature manually in CentOS/RHEL 8.
 - [ ] Ask someone else to test every feature manually in Ubuntu 16.
 - [ ] Ask someone else to test every feature manually in Ubuntu 18.
-- [ ] Ask someone else to test every feature manually in CentOS/RHEL 6.
 - [ ] Ask someone else to test every feature manually in CentOS/RHEL 7.
+- [ ] Ask someone else to test every feature manually in CentOS/RHEL 8.
 - [ ] If something failed, fix and repeat from the beginning (I know, I know).
 - [ ] If something failed and can't be fixed, write it down, make it a priority for the next patch release, get a KB article out.
 

actions/bwc_release_packages.meta.yaml

@@ -10,7 +10,6 @@ parameters:
     type: array
     immutable: true
     default:
-      - RHEL6
       - RHEL7
       - RHEL8
       - UBUNTU16

actions/create_vm.meta.yaml

@@ -42,7 +42,6 @@
     distro:
       default: "UBUNTU18"
       enum:
-        - "RHEL6"
         - "RHEL7"
         - "RHEL8"
         # TODO: Remove Fedora

actions/create_vm_role.meta.yaml

@@ -48,7 +48,6 @@ parameters:
   distro:
     default: UBUNTU18
     enum:
-      - RHEL6
       - RHEL7
       - RHEL8
       # TODO: Remove Fedora
@@ -58,16 +57,13 @@ parameters:
       - UBUNTU18
       - pkg_UBUNTU16
       - pkg_UBUNTU18
-      - pkg_RHEL6
       - pkg_RHEL7
       - pkg_RHEL8
       # TODO: Remove these
-      - pkg_CENTOS6
       - pkg_CENTOS7
       - pkg_CENTOS8
       # TODO: Remove this
       - ubuntu
       # TODO: Remove these
-      - centos6
       - centos7
       - centos8

actions/set_hostname.sh

@@ -25,8 +25,7 @@ if [[ ${DISTRO_LCASE} = "ubuntu" ]]; then
 elif [[ ${DISTRO_LCASE} = "redhat" || ${DISTRO_LCASE} = "centos" ]]; then
     # Note: We also want to make sure /etc/hostname file matches
     sed -i -e "s/\(HOSTNAME=\).*/\1${HOSTNAME}/" /etc/sysconfig/network && echo "${HOSTNAME}" > /etc/hostname && hostname ${HOSTNAME}
-    # RHEL 6 doesn't have hostnamectl, so check for it before we use it
-    which hostnamectl 2>/dev/null && hostnamectl set-hostname --static ${HOSTNAME}
+    hostnamectl set-hostname --static ${HOSTNAME}
     # Make sure the hostname is preserved between the reboots
     echo "preserve_hostname: true" > /etc/cloud/cloud.cfg.d/99_hostname.cfg
 elif [[ ${DISTRO_LCASE} = "fedora" ]]; then

actions/set_hostname_cloud.yaml

@@ -15,7 +15,6 @@
     distro:
       required: true
       enum:
-        - "RHEL6"
         - "RHEL7"
         - "RHEL8"
         # TODO: Remove these
@@ -25,18 +24,16 @@
         - "UBUNTU16"
         - "UBUNTU18"
         # TODO: Remove these
-        - "pkg_CENTOS6"
         - "pkg_CENTOS7"
         - "pkg_CENTOS8"
         # Keep these though
-        - "pkg_RHEL6"
         - "pkg_RHEL7"
         - "pkg_RHEL8"
         - "pkg_UBUNTU16"
         - "pkg_UBUNTU18"
     cmd:
       immutable: true
-      default: '{% if distro in ["RHEL6","RHEL7","RHEL8","pkg_CENTOS6","pkg_CENTOS7","pkg_CENTOS8","pkg_RHEL6","pkg_RHEL7","pkg_RHEL8"] -%}{{redhat}}{% elif distro in ["pkg_UBUNTU16","UBUNTU16","pkg_UBUNTU18","UBUNTU18"] -%}{{ubuntu}}{% elif distro in ["F20","F21"] -%}{{fedora}}{% endif -%}'
+      default: '{% if distro in ["RHEL7","RHEL8","pkg_CENTOS7","pkg_CENTOS8","pkg_RHEL7","pkg_RHEL8"] -%}{{redhat}}{% elif distro in ["pkg_UBUNTU16","UBUNTU16","pkg_UBUNTU18","UBUNTU18"] -%}{{ubuntu}}{% elif distro in ["F20","F21"] -%}{{fedora}}{% endif -%}'
     redhat:
       type: "string"
       immutable: true

actions/setup_e2e_tests.sh

@@ -41,29 +41,17 @@ if [[ -n "$RHTEST" ]]; then
         sudo service mongod restart
     fi
 
-    if [[ "$RHVERSION" -eq 6 ]]; then
-        # For RHEL/CentOS 6
-        sudo yum install -y python-pip jq epel-release
-    elif [[ "$RHVERSION" -eq 7 ]]; then
+    if [[ "$RHVERSION" -eq 7 ]]; then
         # For RHEL/CentOS 7
-        sudo yum install -y python-pip jq
+        sudo yum install -y python-pip jq bats
     else
         # For RHEL/CentOS 8 and above
-        sudo yum install -y python3-pip wget jq
+        sudo yum install -y python3-pip wget jq 
         PIP="pip3"
+        # bats not available in epel for EL 8, Install from npm
+        sudo npm install --global bats
     fi
 
-    # Remove bats-core if it already exists (this happens when test workflows
-    # are re-run on a server when tests are debugged)
-    if [[ -d bats-core ]]; then
-        rm -rf bats-core
-    fi
-
-    # Install from GitHub
-    # RHEL 7+ has both bats and jq package, so we don't need to do this once we
-    # drop RHEL 6 support
-    git clone --branch add_per_test_timing_information --depth 1 https://github.com/Kami/bats-core.git
-    (cd bats-core; sudo ./install.sh /usr/local)
 elif [[ -n "$DEBTEST" ]]; then
     DEBVERSION=`lsb_release --release | awk '{ print $2 }'`
     SUBTYPE=`lsb_release -a 2>&1 | grep Codename | grep -v "LSB" | awk '{print $2}'`
@@ -147,12 +135,7 @@ cd st2tests
 sudo ${PIP} install --upgrade "pip>=9.0,<9.1"
 sudo ${PIP} install --upgrade "virtualenv==15.1.0"
 
-# wheel==0.30.0 doesn't support python 2.6 (default on el6)
-if [[ "$RHVERSION" == 6 ]]; then
-    virtualenv --always-copy --no-download venv -p /opt/stackstorm/st2/bin/python2.7
-else
-    virtualenv --no-download venv
-fi
+virtualenv --no-download venv
 . venv/bin/activate
 ${PIP} install -r test-requirements.txt
 

actions/st2_prep_release_cd_rules.meta.yaml

@@ -27,10 +27,10 @@
         position: 3
     oses:
         type: string
-        description: "Space seperated list of operating systems supported by st2 e.g. 'rhel6 rhel7 u16 u18'"
+        description: "Space seperated list of operating systems supported by st2 e.g. 'rhel7 rhel8 u16 u18'"
         required: true
         position: 4
-        default: rhel6 rhel7 rhel8 u16 u18
+        default: rhel7 rhel8 u16 u18
     local_repo:
         type: string
         description: Location where to clone the repo. Programmatically determined if not provided.

actions/st2_prep_release_rules.meta.yaml

@@ -15,7 +15,6 @@ parameters:
     required: true
   oses:
     type: string
-    description: Space separated list of operating systems supported by st2 e.g. 'rhel6 rhel7 u16 u18'
+    description: Space separated list of operating systems supported by st2 e.g. 'rhel7 rhel8 u16 u18'
     required: true
-    # TODO: Add rhel 8
-    default: rhel6 rhel7 u16 u18
+    default: rhel7 rhel8 u16 u18

actions/st2_release_packages.meta.yaml

@@ -10,7 +10,6 @@ parameters:
     type: array
     immutable: true
     default:
-      - RHEL6
       - RHEL7
       - RHEL8
       - UBUNTU16

actions/st2_upgrade_to_enterprise.meta.yaml

@@ -13,7 +13,6 @@ parameters:
         type: string
         required: true
         enum:
-            - RHEL6
             - RHEL7
             - RHEL8
             - UBUNTU16

actions/workflows/bwc_stage_release_packages.yaml

@@ -7,7 +7,6 @@ input:
   - username: stackstorm
   - wait
   - distros:
-      RHEL6: el6
       RHEL7: el7
       RHEL8: el8
       UBUNTU16: u16

actions/workflows/flow_build.yaml

@@ -78,7 +78,7 @@
       ref: "core.remote_sudo"
       params:
         hosts: "{{dl_server}}"
-        cmd: "cp -Rf /tmp/flow-{{version}}.tar.gz /var/www/sites/releases/html/st2enterprise/apt/trusty/st2flow/ && cp -Rf /tmp/flow-{{version}}.tar.gz /var/www/sites/releases/html/st2enterprise/yum/el/7/st2flow/ && cp -Rf /tmp/flow-{{version}}.tar.gz /var/www/sites/releases/html/st2enterprise/yum/el/6/st2flow/"
+        cmd: "cp -Rf /tmp/flow-{{version}}.tar.gz /var/www/sites/releases/html/st2enterprise/apt/trusty/st2flow/ && cp -Rf /tmp/flow-{{version}}.tar.gz /var/www/sites/releases/html/st2enterprise/yum/el/7/st2flow/ && cp -Rf /tmp/flow-{{version}}.tar.gz /var/www/sites/releases/html/st2enterprise/yum/el/8/st2flow/"
         timeout: 1800
       on-success: "clean_repo"
     -

actions/workflows/st2_stage_release_packages.yaml

@@ -6,7 +6,6 @@ input:
   - projects
   - wait
   - distros:
-      RHEL6: el6
       RHEL7: el7
       RHEL8: el8
       UBUNTU16: u16

pack.yaml

@@ -1,6 +1,6 @@
 ---
 name : st2cd
 description : Continuous delivery pipeline at StackStorm
-version : 0.1.1
+version : 0.1.2
 author : st2-dev
 email : [email protected]