Fix leap and rocky 8 nightly install tests

Signed-off-by: Derek Nola <[email protected]>
dereknola · Jan 21, 2025 · 78f7c57 · 78f7c57
1 parent 649521a
commit 78f7c57
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 20 deletions.
diff --git a/tests/install/centos-9/Vagrantfile b/tests/install/centos-9/Vagrantfile
@@ -61,14 +61,4 @@ Vagrant.configure("2") do |config|
     SHELL
   end
 
-  config.vm.provision "selinux-status", type: "shell", run: "once", inline: "sestatus -v"
-  config.vm.provision "rke2-profile-env", type: "shell", run: "once" do |sh|
-    sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        cat <<-EOF > /etc/profile.d/rke2.sh
-export KUBECONFIG=/etc/rancher/rke2/rke2.yaml PATH=/usr/local/bin:$PATH:/var/lib/rancher/rke2/bin
-EOF
-    SHELL
-  end
-
 end
diff --git a/tests/install/opensuse-leap/Vagrantfile b/tests/install/opensuse-leap/Vagrantfile
@@ -23,6 +23,8 @@ Vagrant.configure("2") do |config|
   config.vm.define "install-leap-15.6", primary: true do |test|
     test.vm.hostname = 'smoke'
     test.vm.provision 'rke2-upload-installer', type: 'file', run: 'always', source: ENV['TEST_INSTALL_SH'], destination: 'install.sh'
+    # Leap 15.6+ VM images are missing procps for some reason.
+    test.vm.provision 'rke2-prepare', type: 'shell', run: 'once', inline: 'zypper install -y apparmor-parser procps'
     test.vm.provision"rke2-install", type: 'rke2', run: "once" do |rke2|
       rke2.installer_url = 'file:///home/vagrant/install.sh'
       rke2.env = %W[ #{external_env} INSTALL_RKE2_TYPE=server]

diff --git a/tests/install/rocky-8/Vagrantfile b/tests/install/rocky-8/Vagrantfile
@@ -23,6 +23,7 @@ Vagrant.configure("2") do |config|
   config.vm.define "install-rocky-8", primary: true do |test|
     test.vm.hostname = 'smoke'
     test.vm.provision "disable-firewall", type: "shell", inline: "systemctl stop firewalld"
+    test.vm.provision "add-bin-path", type: "shell", inline: "echo \"export PATH=/usr/local/bin:\$PATH\" >> ~/.bashrc"
     test.vm.provision 'rke2-upload-installer', type: 'file', run: 'always', source: ENV['TEST_INSTALL_SH'], destination: 'install.sh'
     test.vm.provision"rke2-install", type: 'rke2', run: "once" do |rke2|
       rke2.installer_url = 'file:///home/vagrant/install.sh'
@@ -66,14 +67,4 @@ Vagrant.configure("2") do |config|
     SHELL
   end
 
-  config.vm.provision "selinux-status", type: "shell", run: "once", inline: "sestatus -v"
-  config.vm.provision "rke2-profile-env", type: "shell", run: "once" do |sh|
-    sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        cat <<-EOF > /etc/profile.d/rke2.sh
-export KUBECONFIG=/etc/rancher/rke2/rke2.yaml PATH=/usr/local/bin:$PATH:/var/lib/rancher/rke2/bin
-EOF
-    SHELL
-  end
-
 end