Skip to content

Minor updates for Rocky and upgrade docker engine for CI #5552

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

Merged
amanda11 merged 10 commits into from
Jan 28, 2022
Merged

Minor updates for Rocky and upgrade docker engine for CI #5552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b86905b
Minor updates for Rocky
amanda11 Jan 24, 2022
3a67d5c
Update Changelog with PR
amanda11 Jan 24, 2022
f12646a
Merge branch 'master' into rocky_updates
cognifloyd Jan 24, 2022
5fc032c
Attempt to fix docker CircleCI error
amanda11 Jan 28, 2022
f222732
Merge branch 'rocky_updates' of https://github.com/StackStorm/st2 int…
amanda11 Jan 28, 2022
fa3626c
Update contrib/linux/actions/service.py to work for CentOS Stream
amanda11 Jan 28, 2022
697ddbf
Update docker engine
amanda11 Jan 28, 2022
1d17a25
Merge branch 'rocky_updates' of https://github.com/StackStorm/st2 int…
amanda11 Jan 28, 2022
6dcb2ce
Remove API version check as upgraded docker engine instead
amanda11 Jan 28, 2022
3ab1381
Sync up the CircleCI config with the st2-packages
arm4b Jan 28, 2022
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
14 changes: 2 additions & 12 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,7 @@ jobs:
- setup_remote_docker:
reusable: true # default - false
exclusive: true # default - true
# Temporary workaround for Circle CI issue
# https://discuss.circleci.com/t/setup-remote-docker-connection-failures/26434
version: 18.05.0-ce
version: 19.03.14
- run:
name: Docker version
command: |
Expand Down Expand Up @@ -176,7 +174,7 @@ jobs:
docker cp . st2-packages-vol:${ST2_GITDIR}
- run:
name: Pull dependent Docker Images
command: .circle/docker-compose2.sh pull ${DISTRO}
command: .circle/docker-compose2.sh pull ${DISTRO} || .circle/docker-compose2.sh pull ${DISTRO}
working_directory: ~/st2-packages
- run:
name: Build the ${DISTRO} Packages
Expand All @@ -186,14 +184,6 @@ jobs:
mkdir -p ~/st2/packages/${DISTRO}/log/
docker cp st2-packages-vol:/root/build/. ~/st2/packages/${DISTRO}
working_directory: ~/st2-packages
# # TODO: It works! (~0.5-1min speed-up) Enable CircleCI2.0 cache for pip and wheelhouse later
# - run:
# name: Build the ${DISTRO} Packages 2nd time (compare with pip/wheelhouse cached)
# command: |
# .circle/docker-compose2.sh build ${DISTRO}
# # Once build container finishes we can copy packages directly from it
# docker cp st2-packages-vol:/root/build /tmp/st2-packages
# working_directory: ~/st2-packages
- run:
name: Test the Packages
command: .circle/docker-compose2.sh test ${DISTRO}
Expand Down
5 changes: 4 additions & 1 deletion CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ Fixed
Added
~~~~~

* Minor updates for RockyLinux. #5552
Contributed by Amanda McGuinness (@amanda11 intive)

* Added st2 API get action parameters by ref. #5509

API endpoint ``/api/v1/actions/views/parameters/{action_id}`` accepts ``ref_or_id``.
Expand Down Expand Up @@ -4244,4 +4247,4 @@ v0.5.1 - November 3rd, 2014
Added
~~~~~

* Initial public release
* Initial public release
3 changes: 2 additions & 1 deletion contrib/linux/actions/service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ def get_linux_distribution():
elif (
re.search(distro, "Redhat")
or re.search(distro, "Fedora")
or re.search(distro, "CentOS Linux")
or re.search(distro, "CentOS")
or re.search(distro, "Rocky Linux")
):
cmd_args = ["systemctl", args["act"], args["service"]]

Expand Down
2 changes: 1 addition & 1 deletion st2common/bin/st2ctl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ SYSTEMD_RELOADED=""
# load in environment to allow override of COMPONENTS and ST2_CONF above
# Ubuntu/Debian
[ -r /etc/default/st2ctl ] && source /etc/default/st2ctl
# RHEL/CentOS
# RHEL/CentOS/Rocky
[ -r /etc/sysconfig/st2ctl ] && source /etc/sysconfig/st2ctl


Expand Down