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.

Sign up for GitHub

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5578cf0
Remove EL6
amanda11 Jul 2, 2020
db9b11e
Minor change to CHANGELOG
amanda11 Jul 3, 2020
0f58e6a
Remove sysv
amanda11 Jul 6, 2020
ad81fac
Update CHANGELOG.rst
Jul 6, 2020
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
6 changes: 3 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

👍

# 4CPUs & 8GB RAM CircleCI machine
# sadly, it doesn't work with 'setup_remote_docker'
resource_class: large
Expand All @@ -116,7 +116,7 @@ jobs:
- image: circleci/python:2.7
working_directory: ~/st2
environment:
- DISTROS: "xenial bionic el6 el7 el8"
- DISTROS: "xenial bionic el7 el8"
- ST2_PACKAGES_REPO: /~https://github.com/StackStorm/st2-packages
- ST2_PACKAGES: "st2"
- ST2_CHECKOUT: 0
Expand Down Expand Up @@ -232,7 +232,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: .
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,14 @@ Fixed
up correctly, specifically when specifying a bastion host / jump box. (bug fix) #4973

Contributed by Nick Maludy (@nmaludy Encore Technologies)


Removed
~~~~~~~

* Removed ``CentOS 6``/``RHEL 6`` support #4984

Contributed by Amanda McGuinness (@amanda11 Ammeon Solutions)

3.2.0 - April 27, 2020
----------------------

Expand Down
8 changes: 0 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,14 +981,6 @@ rpms:
$(foreach COM,$(COMPONENTS), pushd $(COM); make rpm; popd;)
pushd st2client && make rpm && popd

rhel-rpms:
@echo
@echo "==================== rpm ===================="
@echo
rm -Rf ~/rpmbuild
$(foreach COM,$(COMPONENTS), pushd $(COM); make rhel-rpm; popd;)
pushd st2client && make rhel-rpm && popd

.PHONY: debs
debs:
@echo
Expand Down
7 changes: 0 additions & 7 deletions st2actions/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

rhel-rpm:
pushd ~ && rpmdev-setuptree && popd
tar --transform=s~^~$(COMPONENTS)-$(VER)/~ -czf $(RPM_SOURCES_DIR)/$(COMPONENTS).tar.gz bin conf $(COMPONENTS)
cp packaging/rpm/$(COMPONENTS)-rhel6.spec $(RPM_SPECS_DIR)/
cd $(RPM_SPECS_DIR) && rpmbuild --clean --rmsource -ba $(COMPONENTS)-rhel6.spec

.PHONY: deb
deb:
mkdir -p ~/debbuild
Expand Down
22 changes: 3 additions & 19 deletions st2actions/bin/runners.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,16 @@ if [ -z "$WORKERS" ]; then
WORKERS="${WORKERS:-4}"
fi

# 1. Choose init type on Debian containers use sysv
if [ -x "$LSB_RELEASE" ]; then
if [ -f /.dockerenv ] && [ $($LSB_RELEASE -is) = Debian ]; then
sv=sysv
svbin=/etc/init.d/$WORKERSVC
fi
fi

# 2. Second criteria
# 1. Choose init type
if [ -z "$sv" -a -x $SYSTEMDCTL ]; then
sv=systemd
svbin=$SYSTEMDCTL
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
sv=sysv
svbin=/etc/init.d/$WORKERSVC
if [ ! -x $svbin ]; then
>&2 echo "Init file not found: $svbin"
>&2 echo "Unknown platform, we support ONLY debian, systemd and sysv!"
exit 99
fi
>&2 echo "Unknown platform, we support ONLY upstart and systemd!"
exit 99
fi

# 2. Spwan workers
Expand All @@ -47,8 +33,6 @@ while [ $i -le $WORKERS ]; do
$svbin $action $SPAWNSVC@$i
elif [ $sv = upstart ]; then
$svbin $action $WORKERSVC WORKERID=$i
elif [ $sv = sysv ]; then
WORKERID=$i $svbin $action
fi
cmdrs=$?
[ $cmdrs -gt 0 ] && rs=$cmdrs
Expand Down
7 changes: 0 additions & 7 deletions st2api/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
rhel-rpm:
pushd ~ && rpmdev-setuptree && popd
tar --transform=s~^~$(COMPONENTS)-$(VER)/~ -czf $(RPM_SOURCES_DIR)/$(COMPONENTS).tar.gz bin conf $(COMPONENTS)
cp packaging/rpm/$(COMPONENTS)-rhel6.spec $(RPM_SPECS_DIR)/
cd $(RPM_SPECS_DIR) && rpmbuild --clean --rmsource -ba $(COMPONENTS)-rhel6.spec

.PHONY: deb
deb:
mkdir -p ~/debbuild
Expand Down
7 changes: 0 additions & 7 deletions st2auth/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
rhel-rpm:
pushd ~ && rpmdev-setuptree && popd
tar --transform=s~^~$(COMPONENTS)-$(VER)/~ -czf $(RPM_SOURCES_DIR)/$(COMPONENTS).tar.gz bin conf $(COMPONENTS)
cp packaging/rpm/$(COMPONENTS)-rhel6.spec $(RPM_SPECS_DIR)/
cd $(RPM_SPECS_DIR) && rpmbuild --clean --rmsource -ba $(COMPONENTS)-rhel6.spec

.PHONY: deb
deb:
mkdir -p ~/debbuild
Expand Down
11 changes: 1 addition & 10 deletions st2client/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,6 @@ rpm:
cp dist/*src.rpm $(RPM_ROOT)/SRPMS/$(COMPONENTS)-$(VER)-$(RELEASE).src.rpm
rm -Rf dist $(COMPONENTS).egg-info ChangeLog AUTHORS build

.PHONY: rhel-rpm
rhel-rpm:
$(PY27) setup.py bdist_rpm --python=$(PY27)
mkdir -p $(RPM_ROOT)/RPMS/noarch
cp dist/$(COMPONENTS)*noarch.rpm $(RPM_ROOT)/RPMS/noarch/$(COMPONENTS)-$(VER)-$(RELEASE).noarch.rpm
mkdir -p $(RPM_ROOT)/SRPMS
cp dist/*src.rpm $(RPM_ROOT)/SRPMS/$(COMPONENTS)-$(VER)-$(RELEASE).src.rpm
rm -Rf dist $(COMPONENTS).egg-info ChangeLog AUTHORS build

.PHONY: deb
deb:
$(PY27) setup.py --command-packages=stdeb.command bdist_deb
Expand Down Expand Up @@ -82,4 +73,4 @@ injectdeps: .stamp-injectdeps
bdist_wheel: .stamp-bdist_wheel
.stamp-bdist_wheel: populate_version
python setup.py bdist_wheel -d $(WHEELDIR)
touch $@
touch $@
4 changes: 1 addition & 3 deletions st2common/bin/st2ctl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 👍

else
echo -e "\e[31mError: Unknown service manager, we ONLY support systemd, upstart and sysv! \e[0m\n"
echo -e "\e[31mError: Unknown service manager, we ONLY support systemd and upstart! \e[0m\n"
exit 1
fi
}
Expand Down
7 changes: 0 additions & 7 deletions st2debug/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
rhel-rpm:
pushd ~ && rpmdev-setuptree && popd
tar --transform=s~^~$(COMPONENTS)-$(VER)/~ -czf $(RPM_SOURCES_DIR)/$(COMPONENTS).tar.gz bin $(COMPONENTS)
cp packaging/rpm/$(COMPONENTS)-rhel6.spec $(RPM_SPECS_DIR)/
cd $(RPM_SPECS_DIR) && rpmbuild --clean --rmsource -ba $(COMPONENTS)-rhel6.spec

.PHONY: deb
deb:
mkdir -p ~/debbuild
Expand Down
7 changes: 0 additions & 7 deletions st2reactor/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@ rpm:
cp packaging/rpm/$(COMPONENTS).spec $(RPM_SPECS_DIR)/
cd $(RPM_SPECS_DIR) && rpmbuild --clean --rmsource -ba $(COMPONENTS).spec

.PHONY: rhel-rpm
rhel-rpm:
pushd ~ && rpmdev-setuptree && popd
tar --transform=s~^~$(COMPONENTS)-$(VER)/~ -czf $(RPM_SOURCES_DIR)/$(COMPONENTS).tar.gz bin conf $(COMPONENTS)
cp packaging/rpm/$(COMPONENTS)-rhel6.spec $(RPM_SPECS_DIR)/
cd $(RPM_SPECS_DIR) && rpmbuild --clean --rmsource -ba $(COMPONENTS)-rhel6.spec

.PHONY: deb
deb:
mkdir -p ~/debbuild
Expand Down
7 changes: 0 additions & 7 deletions st2stream/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
rhel-rpm:
pushd ~ && rpmdev-setuptree && popd
tar --transform=s~^~$(COMPONENTS)-$(VER)/~ -czf $(RPM_SOURCES_DIR)/$(COMPONENTS).tar.gz bin conf $(COMPONENTS)
cp packaging/rpm/$(COMPONENTS)-rhel6.spec $(RPM_SPECS_DIR)/
cd $(RPM_SPECS_DIR) && rpmbuild --clean --rmsource -ba $(COMPONENTS)-rhel6.spec

.PHONY: deb
deb:
mkdir -p ~/debbuild
Expand Down
7 changes: 0 additions & 7 deletions st2tests/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
rhel-rpm:
pushd ~ && rpmdev-setuptree && popd
tar --transform=s~^~$(COMPONENTS)-$(VER)/~ -czf $(RPM_SOURCES_DIR)/$(COMPONENTS).tar.gz bin $(COMPONENTS)
cp packaging/rpm/$(COMPONENTS)-rhel6.spec $(RPM_SPECS_DIR)/
cd $(RPM_SPECS_DIR) && rpmbuild --clean --rmsource -ba $(COMPONENTS)-rhel6.spec

.PHONY: deb
deb:
mkdir -p ~/debbuild
Expand Down