Merge branch 'bugs/#13249' into 'master'

[std][oar] use new Grid'5000 apt source for OAR packages

See merge request !95

steps/data/setup/puppet/modules/env/manifests/common/g5kpackages.pp

@@ -6,13 +6,14 @@
 #  }
 
 define env::common::g5kpackages (
+  String $source_filename = $name,
   Variant[Array, String] $packages = $name,
   String $ensure = installed,
   String $release = ''
 ) {
   include apt
 
-  apt::source { $name:
+  apt::source { $source_filename:
     key      => {
       'id'      => '3C38BDEAA05D4A7BED7815E5B1F34F56797BF2D1',
       'content' => file('env/min/apt/grid5000-archive-key.asc')

steps/data/setup/puppet/modules/env/manifests/std/configure_oar_client.pp

@@ -11,13 +11,12 @@ class env::std::configure_oar_client {
         $oar_repos_release = "stretch-backports_beta"
       }
       'buster' : {
-        $oar_version       = "2.5.10~g5k7-1~bpo10+1";
-        $oar_repos         = "2.5/debian/";
-        $oar_repos_release = "buster-backports_beta"
+        $oar_version       = "2.5.10~g5k8-1";
+        $oar_repos         = "g5k"
       }
       'bullseye' : {
-        $oar_version       = "2.5.9-1";
-        $oar_repos         = "default"
+        $oar_version       = "2.5.10~g5k8-1";
+        $oar_repos         = "g5k"
       }
       default : {
         err "${::lsbdistcodename} not supported."
@@ -36,6 +35,13 @@ class env::std::configure_oar_client {
       'liboar-perl':
         ensure   => $oar_version;
     }
+  } elsif ($oar_repos == "g5k") {
+    env::common::g5kpackages {
+      "oar/${::lsbdistcodename}":
+        source_filename => 'oar',
+        packages        => ['liboar-perl', 'oar-common', 'oar-node'],
+        ensure          => $oar_version
+    }
   } else {
     apt::source {
       'oar-repo':