[taler-grid5k] 03/141: update image

[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 b8f8bb151c56e01010cf264d7a307215df7ff651
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Thu Sep 30 21:55:22 2021 +0200

    update image
---
 README                    | 21 ++++++++-------------
 image/notes.txt           |  1 +
 image/taler-debian11.yaml |  3 +--
 jfed/README               |  2 +-
 jfed/taler-perf.rspec     | 24 ++++++++++++++++++++++++
 jfed/twoboot.rspec        | 17 -----------------
 update.sh                 |  2 +-
 7 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/README b/README
index 3898e58..17f45f5 100644
--- a/README
+++ b/README
@@ -1,28 +1,23 @@
 Use
 
-$ kameleon build debian11-taler.yaml --enable-cache
+$ kameleon build taler-debian11 
 
 to build the image.
 
-Note: theg5k_tgz_file option is not propagated to the ".dsc" file,
-so we must adjust it manually (in build/debian11-taler/debian11-taler.dsc)
-and set 'file' to:
-
-   file: http://public.lyon.grid5000.fr/~grothoff/debian11-taler.tar.zst
-
+Note: Maybe the user needs to be adjusted in g5k_tar_path  
+i.e. http://public.lyon.grid5000.fr/~<G5K_USER>/taler-debian11.tar.zst
 
 Afterwards:
 
-$ cd build/debian11-taler
-$ scp debian11-taler.dsc debian11-taler.tar.zst \
-      grothoff@access.grid5000.fr:lyon/public/
-
+$ cd build/taler-debian11
+$ scp taler-debian11.dsc taler-debian11.tar.zst \
+      <G5K_USER>@access.grid5000.fr:lyon/public/
 
 Then we can use
 
-   http://public.lyon.grid5000.fr/~grothoff/debian11-taler.dsc
+   http://public.lyon.grid5000.fr/~<G5K_USER>/taler-debian11.dsc
 
 for the disk image in jfed.  
 
-jFed example configurations are in the jFed/ directory.
+jFed example configurations are in the jfed/ directory.
 
diff --git a/image/notes.txt b/image/notes.txt
index 48966ed..48bf03c 100644
--- a/image/notes.txt
+++ b/image/notes.txt
@@ -1,3 +1,4 @@
 * option "other_packages_no_clean" in global for yaml image builder
   not properly documented, forced us to hunt down why explictily
   installed packages were removed again after the setup step
+  (found in grid5000/steps/setup/debian/clean_unnecessary_packages.yaml)
diff --git a/image/taler-debian11.yaml b/image/taler-debian11.yaml
index bc2e5d7..2dcf03b 100644
--- a/image/taler-debian11.yaml
+++ b/image/taler-debian11.yaml
@@ -58,8 +58,7 @@ setup:
          wget -O - https://taler.net/taler-systems.gpg.key | apt-key add -
          apt-get update
          apt-upgrade
-         apt-get install -y nginx postgresql-13 taler-exchange taler-auditor 
taler-merchant taler-exchange-offline taler-wallet-cli
-         apt-get install -y sudo git zile
+         apt-get install -y $${other_packages_no_clean}
 
   ## We add steps required by our customization after or before @base. Use
   ## kameleon dryrun debian10_custom.yaml to see the resulting steps in the 
build.
diff --git a/jfed/README b/jfed/README
index a9bf655..5bb7d0a 100644
--- a/jfed/README
+++ b/jfed/README
@@ -1,2 +1,2 @@
-twoboot: simply boot two hosts in different regions with our master image
+taler-perf: boots nodes based on the omnibus image into grid5000
 
diff --git a/jfed/taler-perf.rspec b/jfed/taler-perf.rspec
new file mode 100644
index 0000000..ab153a2
--- /dev/null
+++ b/jfed/taler-perf.rspec
@@ -0,0 +1,24 @@
+<?xml version='1.0'?>
+<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-09-30T20:52:07.138+02:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
+  <node client_id="DB" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am" 
component_id="urn:publicid:IDN+am.grid5000.fr+node+%2F3.0%2Fsites%2Fgrenoble%2Fclusters%2Fyeti%2Fnodes%2Fyeti-1">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="nova-lyon"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="354.33333333333337" y="89.66666666666666"/>
+  </node>
+  <node client_id="Exchange" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am" 
component_id="urn:publicid:IDN+am.grid5000.fr+node+%2F3.0%2Fsites%2Fnancy%2Fclusters%2Fgraphique%2Fnodes%2Fgraphique-2">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="uvb-sophia"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="551.5" 
y="231.5"/>
+  </node>
+  <node client_id="Wallet" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am" 
component_id="urn:publicid:IDN+am.grid5000.fr+node+%2F3.0%2Fsites%2Flille%2Fclusters%2Fchiclet%2Fnodes%2Fchiclet-1">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="uvb-sophia"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="762.5" 
y="384.5"/>
+  </node>
+</rspec>
\ No newline at end of file
diff --git a/jfed/twoboot.rspec b/jfed/twoboot.rspec
deleted file mode 100644
index 3a3c1fb..0000000
--- a/jfed/twoboot.rspec
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0'?>
-<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-09-05T13:16:08.333+02:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
-  <node client_id="node0" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
-    <sliver_type name="raw-pc">
-      <disk_image 
name="http://public.lyon.grid5000.fr/~grothoff/debian11-taler.dsc"/>
-    </sliver_type>
-    <hardware_type name="nova-lyon"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="354.33333333333337" y="89.66666666666666"/>
-  </node>
-  <node client_id="node1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
-    <sliver_type name="raw-pc">
-      <disk_image 
name="http://public.lyon.grid5000.fr/~grothoff/debian11-taler.dsc"/>
-    </sliver_type>
-    <hardware_type name="uvb-sophia"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; 
x="347.33333333333337" y="161.66666666666669"/>
-  </node>
-</rspec>
\ No newline at end of file
diff --git a/update.sh b/update.sh
index a9f8089..78ad208 100644
--- a/update.sh
+++ b/update.sh
@@ -9,7 +9,7 @@ touch /root/at-boot-worked
 cd /root/grid5k && git checkout node-setup && git pull && cd
 
 # Override default /etc/ with the one from this Git.
-cp -r /root/grid5k/etc/* /etc
+# cp -r /root/grid5k/etc/* /etc
 
 HOST=$(hostname)
 

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