[taler-grid5k] 37/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 d30353883ac9a119c597b1b8185c62e5d5e3404a
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Mon Oct 11 22:19:54 2021 +0200

    update image
---
 experiment/taler-perf-any.rspec |  8 +++++++-
 experiment/taler-perf.rspec     |  9 ++++++++-
 image/taler-debian11.yaml       | 13 ++++++++-----
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/experiment/taler-perf-any.rspec b/experiment/taler-perf-any.rspec
index 4eb806e..87ccdf3 100644
--- a/experiment/taler-perf-any.rspec
+++ b/experiment/taler-perf-any.rspec
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-10-11T13:44:52.682+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: 
[...]
+<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-10-11T21:41:28.919+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">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
@@ -30,4 +30,10 @@
     </sliver_type>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="603.5" 
y="226.5"/>
   </node>
+  <node client_id="Monitor" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="936.0" 
y="172.0"/>
+  </node>
 </rspec>
\ No newline at end of file
diff --git a/experiment/taler-perf.rspec b/experiment/taler-perf.rspec
index 22cb0e4..31f59b9 100644
--- a/experiment/taler-perf.rspec
+++ b/experiment/taler-perf.rspec
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-10-11T19:19:01.402+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: 
[...]
+<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-10-11T21:41:58.863+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">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
@@ -35,4 +35,11 @@
     <hardware_type name="grappe-nancy"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="603.5" 
y="226.5"/>
   </node>
+  <node client_id="Monitor" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <hardware_type name="econome-nantes"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="850.0" 
y="154.0"/>
+  </node>
 </rspec>
\ No newline at end of file
diff --git a/image/taler-debian11.yaml b/image/taler-debian11.yaml
index 4838f10..d605078 100644
--- a/image/taler-debian11.yaml
+++ b/image/taler-debian11.yaml
@@ -26,7 +26,7 @@ global:
   ## Environment image path and compression
   # Note: unknown why this is not propagated to the ".dsc" file,
   #       So we must adjust it manually!
-  g5k_tar_path: http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.tar.zst
+  g5k_tar_path: 
"http://public.lille.grid5000.fr/~bfhch01/taler-debian11.tar.zst";
   # g5k_tar_compression: "zstd"
   ## Environment postinstall path, compression, and script command
   # g5k_postinst_path: server:///grid5000/postinstalls/g5k-postinstall.tgz
@@ -38,9 +38,11 @@ global:
   # g5k_kernel_params: ""
   ## Environment visibility
   # g5k_visibility: "shared"
-  other_packages_no_clean: nginx postgresql-13 taler-exchange taler-auditor 
taler-merchant taler-exchange-offline taler-wallet-cli sudo git zile dnsutils 
libtalerexchange-dev prometheus-postgres-exporter prometheus
-  disable_services: nginx postgresql prometheus* 
-  loki_version: v2.3.0
+  packages: "nginx postgresql-13 taler-exchange taler-auditor taler-merchant 
taler-exchange-offline taler-wallet-cli sudo git zile dnsutils 
libtalerexchange-dev prometheus-postgres-exporter prometheus-nginx-exporter"
+  packages_no_recommends: "prometheus"
+  other_packages_no_clean: "$${packages} $${packages_no_recommends}" 
+  disable_services: "nginx postgresql prometheus prometheus-postgres-exporter 
prometheus-nginx-exporter"
+  loki_version: "v2.3.0"
 
   ## Other parameters can be changed, see kameleon info debian10-taler.yaml
 
@@ -63,7 +65,8 @@ setup:
          wget -O - https://taler.net/taler-systems.gpg.key | apt-key add -
          apt-get update
          apt-upgrade
-         apt-get install -y $${other_packages_no_clean}
+         apt-get install -y $${packages}
+         apt-get install -y --no-install-recommends $${packages_no_recommends}
     - loki-promtail:
       - exec_in: |
          apt-get install -y unzip curl

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