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

Remove EL6 support #4984

Merged
merged 4 commits into from
Jul 6, 2020
Merged

Remove EL6 support #4984

merged 4 commits into from
Jul 6, 2020

Conversation

amanda11
Copy link
Contributor

@amanda11 amanda11 commented Jul 2, 2020

EL6 is being deprecated. Remove running of builds in EL6.

Remove rhel-rpm in Makefiles, and keep the rpm for EL7 and above. I was a bit confused with the name rhel-rpm - it seemed to just use the el6 specs - and so I was presuming it was no-longer required - but would need confirmation.

@pull-request-size pull-request-size bot added the size/M PR that changes 30-99 lines. Good size to review. label Jul 2, 2020
@amanda11 amanda11 marked this pull request as draft July 2, 2020 20:25
Copy link
Member

@arm4b arm4b left a comment

Choose a reason for hiding this comment

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

Thanks for working on this!

I just provided a couple more pointers.
Also don't worry about TravisCI tests, - they're unrelated to this change.

CHANGELOG.rst Outdated
@@ -6,6 +6,8 @@ in development

Added
~~~~~
* EL6 deprecation. Removed building of EL6 RPMs and associated jobs
Contributed by Amanda McGuinness (@amanda11 Ammeon Solutions)
Copy link
Member

Choose a reason for hiding this comment

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

This fits into Changed sub-category under the Changelog. Please take a look at examples from the previous release. Also please try to format this changelog message based on those examples.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry - didn't see the different sub-sections.
I see in 3.2.0 there actually was a Removed sub-category with "Removed Ubuntu 14.04 from test matrix #4897" in it.
Would you prefer it in Changed or Removed?

Copy link
Member

Choose a reason for hiding this comment

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

Yes absolutely, Removed is even better 👍
Didn't know we had that section. Thanks for noticing that!

@@ -28,7 +28,7 @@ elif [ -z "$sv" ] && ( /sbin/start 2>&1 | grep -q "missing job name" ); then
sv=upstart
svbin=$UPSTARTCTL
else
# Old debians, redhats and centos, amazon etc
# Old debians, amazon etc
sv=sysv
Copy link
Member

Choose a reason for hiding this comment

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

Good that you found this file!

EL6 was the last platform with sysv init system which relies on /etc/init.d/ service startup files. All OS systems we support right now have systemd only.

Please try to cleanup this file based on that information, I'll help where I can.

@@ -107,7 +107,7 @@ jobs:

# Build & Test st2 packages
packages:
parallelism: 5
parallelism: 4
Copy link
Member

Choose a reason for hiding this comment

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

👍

@arm4b arm4b added this to the 3.3.0 milestone Jul 3, 2020
@@ -27,13 +27,6 @@ rpm:
cp packaging/rpm/$(COMPONENTS).spec $(RPM_SPECS_DIR)/
cd $(RPM_SPECS_DIR) && rpmbuild --clean --rmsource -ba $(COMPONENTS).spec

.PHONY: rhel-rpm
Copy link
Member

Choose a reason for hiding this comment

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

Just FYI the rpm/deb logic in the Makefiles of st2 repository is really outdated and unused code we're guilty to remove before.
All packaging happens in https://github.com/stackstorm/st2-packages

@amanda11
Copy link
Contributor Author

amanda11 commented Jul 3, 2020 via email

@pull-request-size pull-request-size bot added size/L PR that changes 100-499 lines. Requires some effort to review. and removed size/M PR that changes 30-99 lines. Good size to review. labels Jul 6, 2020
@amanda11 amanda11 changed the title [WIP] Remove EL6 support Remove EL6 support Jul 6, 2020
@amanda11
Copy link
Contributor Author

amanda11 commented Jul 6, 2020

Given comment about init.d then there is a python file that checks whether it’s systemd , upstart or sysv and complains if it’s none of those. Shall I update that as well to remove the allowance of sysv?

It was runners.sh that also mentioned sysv. So I've updated that - but I'm not sure if its used, as the st2-packages/runners.sh seems to be what is installed - but that still mentions sysv - so not sure if there's a separate issue raised for updating st2-packages/runners.sh to remove the sysv support.

@amanda11 amanda11 marked this pull request as ready for review July 6, 2020 09:28
@arm4b
Copy link
Member

arm4b commented Jul 6, 2020

Yeah, I will handle st2-packages separately in another PR, per StackStorm/community#39

CHANGELOG.rst Outdated Show resolved Hide resolved
@@ -115,10 +115,8 @@ function service_manager() {
/sbin/initctl $action $svcname
elif command -v service > /dev/null 2>&1; then
service $svcname $action
elif [ -x /etc/init.d/${1} ]; then
/etc/init.d/$svcname $action
Copy link
Member

Choose a reason for hiding this comment

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

good catch for st2ctl 👍

Copy link
Member

@arm4b arm4b left a comment

Choose a reason for hiding this comment

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

Looks good!

Thanks for removing EL6 in the st2 repo!

@arm4b arm4b merged commit 6880a20 into StackStorm:master Jul 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking change enhancement size/L PR that changes 100-499 lines. Requires some effort to review.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants