From 99bd1d31c7ba69fd38bcbbf9b7b33732ff7f57ca Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Thu, 9 May 2019 15:38:35 -0400 Subject: hack: Display IP address of VM from script Useful for accessing it from other terminals. Signed-off-by: Chris Evich --- hack/get_ci_vm.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hack/get_ci_vm.sh b/hack/get_ci_vm.sh index 370cd8a5e..82e304d74 100755 --- a/hack/get_ci_vm.sh +++ b/hack/get_ci_vm.sh @@ -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" -- cgit v1.2.3-54-g00ecf From 53a2994a227c3b00f3b382477718dca18b6a5547 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Fri, 10 May 2019 10:19:55 -0400 Subject: hack: shrink xfer tarball size Signed-off-by: Chris Evich --- hack/get_ci_vm.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/get_ci_vm.sh b/hack/get_ci_vm.sh index 82e304d74..1d9282c05 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: 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=.git --exclude=bin -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 -- cgit v1.2.3-54-g00ecf From 1bf622a0ea5ab24af4aeb9f2065952376ee7fb0f Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Thu, 16 May 2019 13:18:22 -0400 Subject: hack: ignore from all VCS files when tarballing Signed-off-by: Chris Evich --- hack/get_ci_vm.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/get_ci_vm.sh b/hack/get_ci_vm.sh index 1d9282c05..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: ssh-keys generated on the fly +# 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 local repository into a tarball.${NOR}" -showrun --background tar cjf $TMPDIR/$TARBALL --warning=no-file-changed --exclude=.git --exclude=bin -C $LIBPODROOT . +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 -- cgit v1.2.3-54-g00ecf