From 9be3c347bbcd7fbd7ce1b7f4406908b3b422868f Mon Sep 17 00:00:00 2001 From: clime Date: Sun, 17 Dec 2017 20:42:38 +0100 Subject: [PATCH] update test framework --- Vagrantfile | 16 ++++++++-------- .../pki/tls/certs => pkgs-files}/ca-bundle.crt | 0 2 files changed, 8 insertions(+), 8 deletions(-) rename beaker-tests/{files/etc/pki/tls/certs => pkgs-files}/ca-bundle.crt (100%) diff --git a/Vagrantfile b/Vagrantfile index 47d8a0a..ccc71a3 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -9,13 +9,6 @@ Vagrant.configure(2) do |config| distgit.vm.synced_folder ".", "/vagrant", type: "rsync" - # setup test user - distgit.vm.provision "shell", - inline: "useradd clime -G packager" - - distgit.vm.provision "shell", - inline: "echo 'clime ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers" - distgit.vm.provision "shell", inline: "echo 'nameserver 8.8.8.8' >> /etc/resolv.conf" @@ -34,8 +27,15 @@ Vagrant.configure(2) do |config| inline: "cd /vagrant/ && tito build -i --test --rpm", run: "always" + # setup test user + distgit.vm.provision "shell", + inline: "useradd clime -G packager" + + distgit.vm.provision "shell", + inline: "echo 'clime ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers" + distgit.vm.provision "file", - source: "./beaker-tests/pkgs-files/", destination: "/tmp/", + source: "./beaker-tests/pkgs-files", destination: "/tmp/pkgs-files", run: "always" distgit.vm.provision "shell", diff --git a/beaker-tests/files/etc/pki/tls/certs/ca-bundle.crt b/beaker-tests/pkgs-files/ca-bundle.crt similarity index 100% rename from beaker-tests/files/etc/pki/tls/certs/ca-bundle.crt rename to beaker-tests/pkgs-files/ca-bundle.crt