Skip to content

Allow a dev-scripts PR to test configuration change #11178

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
openshift-merge-robot merged 1 commit into from
Aug 25, 2020
Merged

Allow a dev-scripts PR to test configuration change #11178

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ...rator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ scp "${SSHOPTS[@]}" "${CLUSTER_PROFILE_DIR}/pull-secret" "root@${IP}:pull-secret

if [[ -e "${SHARED_DIR}/dev-scripts-additional-config" ]]
then
scp "${SSHOPTS[@]}" "${SHARED_DIR}/dev-scripts-additional-config" "root@${IP}:dev-scripts-additional-config"
scp "${SSHOPTS[@]}" "${SHARED_DIR}/dev-scripts-additional-config" "root@${IP}:/root/dev-scripts/dev-scripts-additional-config"
fi

timeout -s 9 175m ssh "${SSHOPTS[@]}" "root@${IP}" bash - << EOF |& sed -e 's/.*auths.*/*** PULL_SECRET ***/g'
Expand Down Expand Up @@ -87,9 +87,9 @@ echo "export WORKER_MEMORY=16384" >> /root/dev-scripts/config_root.sh
# FIXME(stbenjam): Temporary to work around ovn bug
echo "export IP_STACK=v4" >> /root/dev-scripts/config_root.sh

if [[ -e /root/dev-scripts-additional-config ]]
if [[ -e /root/dev-scripts/dev-scripts-additional-config ]]
then
cat /root/dev-scripts-additional-config >> /root/dev-scripts/config_root.sh
cat /root/dev-scripts/dev-scripts-additional-config >> /root/dev-scripts/config_root.sh
fi

echo 'export KUBECONFIG=/root/dev-scripts/ocp/ostest/auth/kubeconfig' >> /root/.bashrc
Expand Down