From b8d0a571a71d7357ae32667c968b3641e5c1c916 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Thu, 18 Jan 2024 10:11:18 +0100
Subject: [PATCH] =?UTF-8?q?am=C3=A9lioration=20des=20d=C3=A9finitions=20de?=
 =?UTF-8?q?=20VM=20dans=20Vagrant?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* on fait un "apt update" systématique, au cas où on ne jouerait pas le rôle "evolinux-base"
* configuration en ELTS pour Jessie et Stretch
* suppression de Squeeze (plus de box Vagrant dispo)
---
 test/Vagrantfile | 95 ++++++++++++++++++++----------------------------
 1 file changed, 39 insertions(+), 56 deletions(-)

diff --git a/test/Vagrantfile b/test/Vagrantfile
index b0da820..264b2d5 100644
--- a/test/Vagrantfile
+++ b/test/Vagrantfile
@@ -19,10 +19,23 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     libvirt.cpus = 1
   end
 
+  elts_script = <<~SCRIPT
+    echo "" > /etc/apt/sources.list
+    echo "" > /etc/apt/sources.list.d/extended-lts.list
+    echo "deb http://elts.evolix.org/extended-lts $(lsb_release --codename --short) main" >> /etc/apt/sources.list.d/extended-lts.list
+    echo "deb http://elts.evolix.org/extended-lts $(lsb_release --codename --short)-lts main" >> /etc/apt/sources.list.d/extended-lts.list
+    wget --no-check-certificate https://deb.freexian.com/extended-lts/archive-key.gpg -O /etc/apt/trusted.gpg.d/freexian-archive-extended-lts.gpg
+    chmod 644 /etc/apt/trusted.gpg.d/freexian-archive-extended-lts.gpg
+    DEBIAN_FRONTEND=noninteractive apt-get --quiet update
+  SCRIPT
+
   # Bookworm
   config.vm.define :bookworm do |node|
     node.vm.hostname = "bookworm.evolix.net"
     node.vm.box = "debian/bookworm64"
+
+    node.vm.provision "apt update", type: "shell", inline: "apt update"
+
     node.vm.provision :ansible do |ansible|
       ansible.limit = "bookworm"
       ansible.playbook = "vagrant.yml"
@@ -45,6 +58,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.define :bullseye do |node|
     node.vm.hostname = "bullseye.evolix.net"
     node.vm.box = "debian/bullseye64"
+
+    node.vm.provision "apt update", type: "shell", inline: "apt update"
+
     node.vm.provision :ansible do |ansible|
       ansible.limit = "bullseye"
       ansible.playbook = "vagrant.yml"
@@ -67,6 +83,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.define :buster do |node|
     node.vm.hostname = "buster"
     node.vm.box = "debian/buster64"
+
+    node.vm.provision "apt update", type: "shell", inline: "apt update"
+
     node.vm.provision :ansible do |ansible|
       ansible.limit = "buster"
       ansible.playbook = "vagrant.yml"
@@ -86,6 +105,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.define :stretch do |node|
     node.vm.hostname = "stretch"
     node.vm.box = "debian/stretch64"
+
+    node.vm.provision "elts", type: "shell", inline: elts_script
+    node.vm.provision "apt update", type: "shell", inline: "apt update"
+
     node.vm.provision :ansible do |ansible|
       ansible.limit = "stretch"
       ansible.playbook = "vagrant.yml"
@@ -113,6 +136,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
     node.ssh.extra_args = old_ssh_options
 
+    node.vm.provision "elts", type: "shell", inline: elts_script
+    node.vm.provision "apt update", type: "shell", inline: "apt update"
+
     node.vm.provision :ansible do |ansible|
       ansible.limit = "jessie"
       ansible.playbook = "vagrant.yml"
@@ -129,66 +155,23 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
   end
 
-  # Squeeze
-  config.vm.define :squeeze do |node|
-    node.vm.hostname = "squeeze"
-    node.vm.box = "debian/squeeze64"
-    node.ssh.extra_args = old_ssh_options
-    node.vm.provision :ansible do |ansible|
-      ansible.limit = "squeeze"
-      ansible.playbook = "vagrant.yml"
-      # ansible.tags = "mysql"
-      ansible.raw_ssh_args = old_ssh_options
-      ansible.raw_arguments = [
-        "-b",
-        "--ask-vault-pass",
-        # "--diff",
-        # "--step",
-        # "--syntax",
-        # "-vvv",
-      ]
-    end
-  end
-
-
-  # # Stretch
-  # config.vm.define :mongo1 do |node|
-  #   node.vm.synced_folder "./vagrant_share/", "/vagrant", disabled: false
-  #   node.vm.hostname = "mongo1"
-  #   node.vm.box = "debian/stretch64"
+  # # Squeeze
+  # config.vm.define :squeeze do |node|
+  #   node.vm.hostname = "squeeze"
+  #   node.vm.box = "debian/squeeze64"
+  #   node.ssh.extra_args = old_ssh_options
   #   node.vm.provision :ansible do |ansible|
-  #     ansible.limit = "mongo1"
-  #     ansible.playbook = "vagrant-mongo.yml"
+  #     ansible.limit = "squeeze"
+  #     ansible.playbook = "vagrant.yml"
   #     # ansible.tags = "mysql"
+  #     ansible.raw_ssh_args = old_ssh_options
   #     ansible.raw_arguments = [
   #       "-b",
-  #       # "--ask-vault-pass",
-  #     ]
-  #   end
-  # end
-  # config.vm.define :mongo2 do |node|
-  #   node.vm.hostname = "mongo2"
-  #   node.vm.box = "debian/stretch64"
-  #   node.vm.provision :ansible do |ansible|
-  #     ansible.limit = "mongo2"
-  #     ansible.playbook = "vagrant-mongo.yml"
-  #     # ansible.tags = "mysql"
-  #     ansible.raw_arguments = [
-  #       "-b",
-  #       # "--ask-vault-pass",
-  #     ]
-  #   end
-  # end
-  # config.vm.define :mongo3 do |node|
-  #   node.vm.hostname = "mongo3"
-  #   node.vm.box = "debian/stretch64"
-  #   node.vm.provision :ansible do |ansible|
-  #     ansible.limit = "mongo3"
-  #     ansible.playbook = "vagrant-mongo.yml"
-  #     # ansible.tags = "mysql"
-  #     ansible.raw_arguments = [
-  #       "-b",
-  #       # "--ask-vault-pass",
+  #       "--ask-vault-pass",
+  #       # "--diff",
+  #       # "--step",
+  #       # "--syntax",
+  #       # "-vvv",
   #     ]
   #   end
   # end