Skip to content

Install all runner packages into st2 virtual environment #585

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
merged 6 commits into from
Oct 17, 2018
Merged

Install all runner packages into st2 virtual environment #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5b91b89
Add in all runner packages as dependencies.
Kami Sep 25, 2018
545ac9a
No need anymore to copy the runners dir over.
Kami Sep 26, 2018
dba5852
runners directory has been deprecated.
Kami Sep 27, 2018
d02f9de
register_runners post install step is not needed anymore.
Kami Sep 27, 2018
0b9a2d8
Merge branch 'master' of github.com:StackStorm/st2-packages into gene…
Kami Oct 16, 2018
bec6cf2
Pin it to a st2 branch for testing.
Kami Oct 16, 2018
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# with real gitrevs during releases. Note that they are commented out, so that they do not interfere
# with build parameters. st2cd prep tasks will uncomment these on a branch, and replace with proper
# gitrefs.
# ST2_GITREV: ""
ST2_GITREV: "stevedore-runners"
Copy link
Member

@arm4b arm4b Oct 17, 2018

Choose a reason for hiding this comment

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

Let's please avoid this approach in future as it fails all the PRs in st2 repo as well as release automation. And so packages which should be built + deployed to staging-unstable are not there because this PR pins target branch.

It's OK to pin the branch for one-time CI check in PR to verify if stings work, but not good to block it for everyone else.

See alternative approach in #588 which does the needful with less sacrifice.

Copy link
Member Author

@Kami Kami Oct 17, 2018

Choose a reason for hiding this comment

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

It was chicken and the egg / cyclic dependency problem and the only other solution was to force merge without all the tests passing.

This was supposed to be a temporary change, but then I got blocked by CI server being in a broken state so I couldn't merge other PR to get it resolved.

# ST2MISTRAL_GITREV: ""
steps:
- checkout
Expand Down
1 change: 0 additions & 1 deletion packages/st2/debian/install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
../contrib/runners opt/stackstorm/
../contrib/core opt/stackstorm/packs/
../contrib/packs opt/stackstorm/packs/
../contrib/linux opt/stackstorm/packs/
Expand Down
7 changes: 0 additions & 7 deletions packages/st2/debian/postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,6 @@ set_permissions() {
echo "$fileperms" | cut -f1,2,4 -d' ' | xargs -L1 chmod
}

register_runners() {
echo "Registering st2 runners on upgrade."
st2ctl reload --register-runners --register-fail-on-failure
}

# Choose first install or upgrade
[ -f $ST2_UPGRADESTAMP ] && upgrading=1 || :

Expand All @@ -68,8 +63,6 @@ case "$1" in
;;
esac

[ "$upgrading" -eq 1 ] && register_runners

# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.

Expand Down
14 changes: 13 additions & 1 deletion packages/st2/in-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,17 @@ st2reactor
st2exporter
st2debug
st2tests
stackstorm-runner-orchestra
git+https://github.com/StackStorm/st2-auth-backend-pam.git@master#egg=st2-auth-backend-pam
stackstorm-runner-action-chain
stackstorm-runner-announcement
stackstorm-runner-cloudslang
stackstorm-runner-http
stackstorm-runner-inquirer
stackstorm-runner-local
stackstorm-runner-mistral-v2
stackstorm-runner-noop
stackstorm-runner-orquesta
stackstorm-runner-python
stackstorm-runner-remote
stackstorm-runner-windows
stackstorm-runner-winrm
7 changes: 0 additions & 7 deletions packages/st2/rpm/postinst_script.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +0,0 @@
register_runners() {
st2ctl reload --register-runners --register-fail-on-failure
}

if [ "$1" -ge 1 ]; then
register_runners
fi
2 changes: 0 additions & 2 deletions packages/st2/rpm/st2.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ Conflicts: st2common
%files
%defattr(-,root,root,-)
/opt/stackstorm/%{venv_name}
/opt/stackstorm/runners/*
%{_bindir}/*
%config %{_sysconfdir}/bash_completion.d/st2
%config(noreplace) %{_sysconfdir}/logrotate.d/st2
Expand All @@ -81,7 +80,6 @@ Conflicts: st2common
%{_datadir}/doc/st2
%attr(755, %{svc_user}, root) /opt/stackstorm/configs
%attr(755, %{svc_user}, root) /opt/stackstorm/exports
%attr(755, %{svc_user}, root) /opt/stackstorm/runners/*
%attr(755, %{svc_user}, root) %{_localstatedir}/log/st2
%attr(755, %{svc_user}, root) %{_localstatedir}/run/st2
%attr(775, root, %{packs_group}) /opt/stackstorm/packs/*
Expand Down