Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate RHEL 6 / CentOS 6 #439

Merged
merged 6 commits into from
Jul 31, 2020
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.1.2

Removed EL6 and added EL8

## 0.1.1

Disabled rules that report VM provision/destroy messages
10 changes: 5 additions & 5 deletions CHECKLIST.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand All @@ -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.

Expand Down
1 change: 0 additions & 1 deletion actions/bwc_release_packages.meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ parameters:
type: array
immutable: true
default:
- RHEL6
- RHEL7
- RHEL8
- UBUNTU16
Expand Down
1 change: 0 additions & 1 deletion actions/create_vm.meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
distro:
default: "UBUNTU18"
enum:
- "RHEL6"
- "RHEL7"
- "RHEL8"
# TODO: Remove Fedora
Expand Down
4 changes: 0 additions & 4 deletions actions/create_vm_role.meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ parameters:
distro:
default: UBUNTU18
enum:
- RHEL6
- RHEL7
- RHEL8
# TODO: Remove Fedora
Expand All @@ -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
19 changes: 0 additions & 19 deletions actions/make_rhel_rpms.yaml

This file was deleted.

3 changes: 1 addition & 2 deletions actions/set_hostname.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions actions/set_hostname_cloud.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
distro:
required: true
enum:
- "RHEL6"
- "RHEL7"
- "RHEL8"
# TODO: Remove these
Expand All @@ -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
Expand Down
29 changes: 7 additions & 22 deletions actions/setup_e2e_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,29 +41,19 @@ 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"
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
# bats not available in epel for EL 8, Install from GitHub
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is going to sound weird. You're right that bats is not available in EPEL for RHEL 8. But it is available, for some reason, via npm. So instead of installing from GitHub, let's install with npm:

npm install --global bats

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Odd - will fix

rm -rf bats-core
git clone --branch add_per_test_timing_information --depth 1 https://github
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This URL is not complete.

(cd bats-core; sudo ./install.sh /usr/local)
fi

blag marked this conversation as resolved.
Show resolved Hide resolved
# 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}'`
Expand Down Expand Up @@ -147,12 +137,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

Expand Down
4 changes: 2 additions & 2 deletions actions/st2_prep_release_cd_rules.meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 2 additions & 3 deletions actions/st2_prep_release_rules.meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion actions/st2_release_packages.meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ parameters:
type: array
immutable: true
default:
- RHEL6
- RHEL7
- RHEL8
- UBUNTU16
Expand Down
1 change: 0 additions & 1 deletion actions/st2_upgrade_to_enterprise.meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ parameters:
type: string
required: true
enum:
- RHEL6
- RHEL7
- RHEL8
- UBUNTU16
Expand Down
1 change: 0 additions & 1 deletion actions/workflows/bwc_stage_release_packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ input:
- username: stackstorm
- wait
- distros:
RHEL6: el6
RHEL7: el7
RHEL8: el8
UBUNTU16: u16
Expand Down
2 changes: 1 addition & 1 deletion actions/workflows/flow_build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
-
Expand Down
1 change: 0 additions & 1 deletion actions/workflows/st2_stage_release_packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ input:
- projects
- wait
- distros:
RHEL6: el6
RHEL7: el7
RHEL8: el8
UBUNTU16: u16
Expand Down
2 changes: 1 addition & 1 deletion pack.yaml
Original file line number Diff line number Diff line change
@@ -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]
25 changes: 0 additions & 25 deletions rules/st2_pkg_test_stable_rhel6.yaml

This file was deleted.

27 changes: 0 additions & 27 deletions rules/st2_pkg_test_stable_rhel6_enterprise.yaml

This file was deleted.