Skip to content

[v3.4] Backport sudo -E CI fix #5187

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 2 commits into from
Mar 11, 2021
Merged

[v3.4] Backport sudo -E CI fix #5187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d90cce
make add-itest-user scripts more verbose
cognifloyd Mar 11, 2021
6f9703d
use sudo -E to preserve env vars
cognifloyd Mar 11, 2021
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 .circle/add-itest-user.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

set -e
set -ex

if [ "$(whoami)" != 'root' ]; then
echo 'Please run with sudo'
Expand Down
11 changes: 6 additions & 5 deletions scripts/travis/add-itest-user-key.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
#!/usr/bin/env bash

set -e
set -ex
mkdir -p ~/.ssh

# Generate ssh keys on StackStorm box and copy over public key into remote box.
ssh-keygen -f ~/.ssh/st2_id_rsa -P ""

# sudo -E = preserve HOME var
# Authorize key-base acces
sudo bash -c "cat ~/.ssh/st2_id_rsa.pub >> ~/.ssh/authorized_keys"
sudo chmod 0600 ~/.ssh/authorized_keys
sudo chmod 0700 ~/.ssh
sudo chown -R "${ST2_CI_USER}:${ST2_CI_USER}" ~/.ssh
sudo -E bash -xc "cat ~/.ssh/st2_id_rsa.pub >> ~/.ssh/authorized_keys"
sudo -E chmod 0600 ~/.ssh/authorized_keys
sudo -E chmod 0700 ~/.ssh
sudo -E chown -R "${ST2_CI_USER}:${ST2_CI_USER}" ~/.ssh