[taler-grid5k] 72/73: add possibility to define grid5k repo branch for experiments

[gnunet]

This is an automated email from the git hooks/post-receive script.

marco-boss pushed a commit to branch master
in repository grid5k.

commit f3837cb1c03fdb7235d3fac8d2c997ebe8b7ff77
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Tue Dec 14 15:08:56 2021 +0100

    add possibility to define grid5k repo branch for experiments
---
 experiment/README.md          | 4 ++--
 experiment/env                | 3 +++
 experiment/scripts/install.sh | 1 +
 experiment/scripts/setup.sh   | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/experiment/README.md b/experiment/README.md
index 6b190e9..0517538 100644
--- a/experiment/README.md
+++ b/experiment/README.md
@@ -44,8 +44,8 @@ To quickly test fixes of new commits in 
gnunet,exchange,merchant and wallet, the
 which can be run inside a running experiment rather than rebuilding the whole 
image.
 
 To do so copy the following snippet into the `Multi Command` window in jFed:
-Please adjust commits as needed, the ones which are not defined will not be 
built.
-The ones which are empty will build on master.
+Please adjust commits as needed, the ones which are not defined or empty will 
not be built.
+The ones which are a space only (" ") will build on master.
 
 ```bash
 #!/bin/bash
diff --git a/experiment/env b/experiment/env
index b6356bf..a0f3e9d 100644
--- a/experiment/env
+++ b/experiment/env
@@ -13,6 +13,9 @@ DNS_ZONE=perf.taler
 # Where this repository is located inside the image
 # Should not need to be changed unless the image itself was adjusted
 G5K_HOME=/root/taler/grid5k
+# Which branch of this repository to checkout for
+# configuration files
+G5K_COMMIT_SHA=master
 
 # Domain names for the hosts inside the grid.
 # The most certainly do not need to be adjusted.
diff --git a/experiment/scripts/install.sh b/experiment/scripts/install.sh
index 9e3703f..86d8ed6 100755
--- a/experiment/scripts/install.sh
+++ b/experiment/scripts/install.sh
@@ -46,6 +46,7 @@ if [ ! -d "${TALER_HOME}" ]; then
   mkdir "${TALER_HOME}"
 fi
 
+# Use ! -z since -n would be false for ""
 if [ ! -z "${GNUNET_COMMIT_SHA}" ]; then
   echo "INFO installing GNUnet"
   install "https://git.gnunet.org/gnunet.git"; \
diff --git a/experiment/scripts/setup.sh b/experiment/scripts/setup.sh
index b6f44a6..6d5b544 100644
--- a/experiment/scripts/setup.sh
+++ b/experiment/scripts/setup.sh
@@ -87,7 +87,7 @@ function setup_environment() {
 # Setup shared configurations such as the ones from configs/*
 function setup_config() {
   # Temporarily checkout to the feature branch
-  cd "${G5K_HOME}" && git checkout node-setup && git pull && cd
+  cd "${G5K_HOME}" && git checkout "${G5K_COMMIT_SHA}" && git pull && cd
   
   # Remove default nginx config
   rm /etc/nginx/sites-enabled/default > /dev/null 2>&1 || true

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.