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

Fix sno path #60119

Merged
merged 3 commits into from
Dec 24, 2024
Merged

Fix sno path #60119

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6f9b94
Tweak path to fetch SNO kubeconfig
rsevilla87 Dec 23, 2024
5884973
Add missing kubeconfig suffix
rsevilla87 Dec 24, 2024
964ceb2
Move conditional outside ssh command
rsevilla87 Dec 24, 2024
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
9 changes: 8 additions & 1 deletion ...ep-registry/openshift-qe/installer/bm/deploy/openshift-qe-installer-bm-deploy-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ CRUCIBLE_URL=$(cat "/secret/crucible_url")
JETLAG_PR=${JETLAG_PR:-}
REPO_NAME=${REPO_NAME:-}
PULL_NUMBER=${PULL_NUMBER:-}
KUBECONFIG_SRC=""

cat <<EOF >>/tmp/all.yml
---
Expand Down Expand Up @@ -153,6 +154,12 @@ scp -q ${SSH_ARGS} /secret/pull_secret root@${bastion}:${jetlag_repo}/pull_secre
scp -q ${SSH_ARGS} /tmp/clean-resources.sh root@${bastion}:/tmp/
scp -q ${SSH_ARGS} /tmp/prereqs-updated.sh root@${bastion}:/tmp/

if [[ ${TYPE} == 'sno' ]]; then
KUBECONFIG_SRC='/root/sno/{{ groups.sno[0] }}/kubeconfig'
else
KUBECONFIG_SRC=/root/${TYPE}/kubeconfig
fi

ssh ${SSH_ARGS} root@${bastion} "
set -e
set -o pipefail
Expand All @@ -164,7 +171,7 @@ ssh ${SSH_ARGS} root@${bastion} "
ansible-playbook -i ansible/inventory/$LAB_CLOUD.local ansible/setup-bastion.yml | tee /tmp/ansible-setup-bastion-$(date +%s)
ansible-playbook -i ansible/inventory/$LAB_CLOUD.local ansible/${TYPE}-deploy.yml -v | tee /tmp/ansible-${TYPE}-deploy-$(date +%s)
mkdir -p /root/$LAB/$LAB_CLOUD/$TYPE
ansible -i ansible/inventory/$LAB_CLOUD.local bastion -m fetch -a 'src=/root/${TYPE}/kubeconfig dest=/root/$LAB/$LAB_CLOUD/$TYPE/kubeconfig flat=true'
ansible -i ansible/inventory/$LAB_CLOUD.local bastion -m fetch -a 'src=${KUBECONFIG_SRC} dest=/root/$LAB/$LAB_CLOUD/$TYPE/kubeconfig flat=true'
deactivate
rm -rf .ansible
"
Expand Down