-
Notifications
You must be signed in to change notification settings - Fork 16
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
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
3303018
Remove EL6 support
amanda11 613d4f6
Missed EL8 reference
amanda11 f00c110
Address review comments to install bats via yum, therefore also do no…
amanda11 d6dc27c
Mark TODO as bats not in CentOS 8
amanda11 41228a0
For EL8 still need bats from github repo
amanda11 e2827ca
Install bats from npm
amanda11 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,6 @@ parameters: | |
type: array | ||
immutable: true | ||
default: | ||
- RHEL6 | ||
- RHEL7 | ||
- RHEL8 | ||
- UBUNTU16 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,7 +42,6 @@ | |
distro: | ||
default: "UBUNTU18" | ||
enum: | ||
- "RHEL6" | ||
- "RHEL7" | ||
- "RHEL8" | ||
# TODO: Remove Fedora | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
rm -rf bats-core | ||
git clone --branch add_per_test_timing_information --depth 1 https://github | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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}'` | ||
|
@@ -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 | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,6 @@ parameters: | |
type: array | ||
immutable: true | ||
default: | ||
- RHEL6 | ||
- RHEL7 | ||
- RHEL8 | ||
- UBUNTU16 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,7 +13,6 @@ parameters: | |
type: string | ||
required: true | ||
enum: | ||
- RHEL6 | ||
- RHEL7 | ||
- RHEL8 | ||
- UBUNTU16 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,7 +7,6 @@ input: | |
- username: stackstorm | ||
- wait | ||
- distros: | ||
RHEL6: el6 | ||
RHEL7: el7 | ||
RHEL8: el8 | ||
UBUNTU16: u16 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,6 @@ input: | |
- projects | ||
- wait | ||
- distros: | ||
RHEL6: el6 | ||
RHEL7: el7 | ||
RHEL8: el8 | ||
UBUNTU16: u16 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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] |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Odd - will fix