[taler-grid5k] 30/141: add script order

[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 9c51160a680642e61aef1173fd5410e82b1a5ed0
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Sat Oct 9 17:40:01 2021 +0200

    add script order
---
 experiment/cleardns.sh                  |  4 +++-
 experiment/experiment-specification.yml |  2 +-
 experiment/run.sh                       | 16 +++++++++++++++-
 experiment/setup.sh                     | 15 +--------------
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/experiment/cleardns.sh b/experiment/cleardns.sh
index 9ba530f..9a23017 100644
--- a/experiment/cleardns.sh
+++ b/experiment/cleardns.sh
@@ -2,11 +2,13 @@
 # Clears the DNS server for the new experiment
 set -eux
 
+source .env
+
 # Delete all old dns entries of the previous experitment
 while IFS='=' read -r name value; do
   if [[ $name == *"_DOMAIN" && $value == *".${DNS_ZONE}" ]]; then 
     nsupdate -k /root/ddns.key -v << EOF
-server ${NS_IP}
+server ${DNS_HOST}
 zone ${DNS_ZONE}
 update delete ${value} A
 send
diff --git a/experiment/experiment-specification.yml 
b/experiment/experiment-specification.yml
index 04fb8c3..5526ca9 100755
--- a/experiment/experiment-specification.yml
+++ b/experiment/experiment-specification.yml
@@ -7,6 +7,6 @@ upload:
     permission: "774"
 execute:
   - bundled: setup.sh
-  - bundles: cleardns.sh
+  - bundled: cleardns.sh
     nodes: [Exchange]
   - bundled: run.sh
diff --git a/experiment/run.sh b/experiment/run.sh
index 0cb6d5b..a80f184 100644
--- a/experiment/run.sh
+++ b/experiment/run.sh
@@ -1,6 +1,20 @@
 #!/bin/bash
 # Run the experitment
-set -eux
+set -euax
+
+# They start the scripts with /bin/bash -c
+source .env
+
+# Set a dynamic domain name in our own dns
+# argument: the domain to be added
+function set_ddn() {
+  nsupdate -k /root/ddns.key -v << EOF
+server ${DNS_HOST}
+zone ${DNS_ZONE}
+update add $1 60 A $(hostname -I)
+send
+EOF
+}
 
 case "${HOSTNAME}" in 
   ${BANK_HOSTS}) 
diff --git a/experiment/setup.sh b/experiment/setup.sh
old mode 100755
new mode 100644
index 9c73a4b..f5eee2f
--- a/experiment/setup.sh
+++ b/experiment/setup.sh
@@ -1,8 +1,7 @@
 #!/bin/bash
-# Setup the experiment
+# Setup nodes for the experiment
 set -euax
 
-# Load the environment configuration
 source .env
 cat .env | tee -a /etc/environment
 
@@ -10,17 +9,6 @@ G5K_HOME=/root/grid5k
 
 NS_IP=$(host ${DNS_HOST} | sed -n 1p | awk '{print $4}')
 
-# Set a dynamic domain name in our own dns
-# argument: the domain to be added
-function set_ddn() {
-  nsupdate -k /root/ddns.key -v << EOF
-server ${NS_IP}
-zone ${DNS_ZONE}
-update add $1 600 A $(hostname -I)
-send
-EOF
-}
-
 # Temporarily checkout to the feature branch
 cd "${G5K_HOME}" && git checkout node-setup && git pull && cd
 
@@ -46,4 +34,3 @@ nameserver ${NS_IP}" /etc/resolv.conf
 fi
 
 exit 0
-

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