summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-05-23 15:49:11 +0200
committerGitHub <noreply@github.com>2019-05-23 15:49:11 +0200
commit579fd01f7df929373a6b68a4c4dda17084832db4 (patch)
tree4183a656955567dbc4e10931dcc16b1c223b7a3a
parente0376b9c3f9af07d9e58a04a7cd58a7c065305e3 (diff)
parent1bf622a0ea5ab24af4aeb9f2065952376ee7fb0f (diff)
downloadpodman-579fd01f7df929373a6b68a4c4dda17084832db4.tar.gz
podman-579fd01f7df929373a6b68a4c4dda17084832db4.tar.bz2
podman-579fd01f7df929373a6b68a4c4dda17084832db4.zip
Merge pull request #3097 from cevich/show_ip
hack: Display IP address of VM from script
-rwxr-xr-xhack/get_ci_vm.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/hack/get_ci_vm.sh b/hack/get_ci_vm.sh
index 370cd8a5e..aed0042fb 100755
--- a/hack/get_ci_vm.sh
+++ b/hack/get_ci_vm.sh
@@ -231,10 +231,10 @@ then
"$HOME/.config/gcloud/configurations/config_default"
fi
-# Couldn't make rsync work with gcloud's ssh wrapper :(
+# Couldn't make rsync work with gcloud's ssh wrapper because ssh-keys generated on the fly
TARBALL=$VMNAME.tar.bz2
-echo -e "\n${YEL}Packing up repository into a tarball $VMNAME.${NOR}"
-showrun --background tar cjf $TMPDIR/$TARBALL --warning=no-file-changed -C $LIBPODROOT .
+echo -e "\n${YEL}Packing up local repository into a tarball.${NOR}"
+showrun --background tar cjf $TMPDIR/$TARBALL --warning=no-file-changed --exclude-vcs-ignores -C $LIBPODROOT .
trap delvm INT # Allow deleting VM if CTRL-C during create
# This fails if VM already exists: permit this usage to re-init
@@ -275,7 +275,9 @@ showrun $SSH_CMD --command "rm -f /tmp/$TARBALL"
echo -e "\n${YEL}Executing environment setup${NOR}"
showrun $SSH_CMD --command "$SETUP_CMD"
-echo -e "\n${YEL}Connecting to $VMNAME\n${RED}(option to delete VM upon logout).${NOR}\n"
+VMIP=$($PGCLOUD compute instances describe $VMNAME --format='get(networkInterfaces[0].accessConfigs[0].natIP)')
+
+echo -e "\n${YEL}Connecting to $VMNAME${NOR}\nPublic IP Address: $VMIP\n${RED}(option to delete VM upon logout).${NOR}\n"
if [[ -n "$ROOTLESS_USER" ]]
then
echo "Re-chowning source files after transfer"