Use util functions with install tests

Signed-off-by: Derek Nola <derek.nola@suse.com>
dereknola · Feb 12, 2024 · a09f522 · a09f522
1 parent 1d708d0
commit a09f522
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 334 deletions.
diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml
@@ -65,6 +65,9 @@ jobs:
           vagrant scp k3s /tmp/k3s
           vagrant ssh -c "sudo mv /tmp/k3s /usr/local/bin/k3s"
           vagrant provision --provision-with=k3s-upload
+      - name: Add binary to PATH
+        if: matrix.vm == 'centos-7' || matrix.vm == 'rocky-8' || matrix.vm == 'rocky-9'
+        run: vagrant provision --provision-with=add-bin-path
       - name: "⏩ Install K3s"
         run: |
           vagrant provision --provision-with=k3s-prepare

diff --git a/tests/install/centos-7/Vagrantfile b/tests/install/centos-7/Vagrantfile
@@ -10,8 +10,12 @@ Vagrant.configure("2") do |config|
   config.vm.boot_timeout = ENV['TEST_VM_BOOT_TIMEOUT'] || 600 # seconds
   config.vm.synced_folder '.', '/vagrant', disabled: true
 
+  # Load in helper functions
+  load "../install_util.rb"
+
   config.vm.define 'install-centos-7', primary: true do |test|
     test.vm.hostname = 'smoke'
+    test.vm.provision "add-bin-path", type: "shell", inline: "echo \"export PATH=/usr/local/bin:\$PATH\" >> ~/.bashrc"
     test.vm.provision 'k3s-upload', type: 'file', run: 'always', source: ENV['TEST_INSTALL_SH'], destination: 'install.sh'
     test.vm.provision 'k3s-install', type: 'k3s', run: 'once' do |k3s|
       k3s.installer_url = 'file:///home/vagrant/install.sh'
@@ -23,76 +27,22 @@ Vagrant.configure("2") do |config|
         selinux: true
         token: 'vagrant'
       YAML
-      k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321
-    end
-    test.vm.provision "k3s-wait-for-node", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
-      sh.env = { :PATH => "/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" }
-      sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        set -eu -o pipefail
-        echo 'Waiting for node to be ready ...'
-        time timeout 300 bash -c 'while ! (kubectl wait --for condition=ready node/$(hostname) 2>/dev/null); do sleep 5; done'
-        kubectl get node,all -A -o wide
-      SHELL
-    end
-    test.vm.provision "k3s-wait-for-coredns", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
-      sh.env = { :PATH => "/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" }
-      sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        set -eu -o pipefail
-        function describe-coredns {
-          RC=$?
-          if [[ $RC -ne 0 ]]; then
-            kubectl describe node
-            kubectl --namespace kube-system describe pod -l k8s-app=kube-dns
-            kubectl --namespace kube-system logs -l k8s-app=kube-dns
-          fi
-          exit $RC
-        }
-        trap describe-coredns EXIT
-        time timeout 300 bash -c 'while ! (kubectl --namespace kube-system rollout status --timeout 10s deploy/coredns 2>/dev/null); do sleep 5; done'
-      SHELL
-    end
-    test.vm.provision "k3s-wait-for-local-storage", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
-      sh.env = { :PATH => "/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" }
-      sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        set -eu -o pipefail
-        time timeout 300 bash -c 'while ! (kubectl --namespace kube-system rollout status --timeout 10s deploy/local-path-provisioner 2>/dev/null); do sleep 5; done'
-      SHELL
-    end
-    test.vm.provision "k3s-wait-for-metrics-server", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
-      sh.env = { :PATH => "/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" }
-      sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        set -eu -o pipefail
-        time timeout 300 bash -c 'while ! (kubectl --namespace kube-system rollout status --timeout 10s deploy/metrics-server 2>/dev/null); do sleep 5; done'
-      SHELL
-    end
-    test.vm.provision "k3s-wait-for-traefik", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
-      sh.env = { :PATH => "/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" }
-      sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        set -eu -o pipefail
-        time timeout 300 bash -c 'while ! (kubectl --namespace kube-system rollout status --timeout 10s deploy/traefik 2>/dev/null); do sleep 5; done'
-      SHELL
-    end
-    test.vm.provision "k3s-status", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
-      sh.env = { :PATH => "/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" }
-      sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        set -eux -o pipefail
-        kubectl get node,all -A -o wide
-      SHELL
-    end
-    test.vm.provision "k3s-procps", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
-      sh.env = { :PATH => "/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" }
-      sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        set -eux -o pipefail
-        ps auxZ | grep -E 'k3s|kube|container' | grep -v grep
-      SHELL
     end
+
+    waitForNodeReady(test.vm)
+
+    waitForCoreDns(test.vm)
+
+    waitForLocalStorage(test.vm)
+
+    waitForMetricsServer(test.vm)
+
+    waitForTraefik(test.vm)
+
+    kubectlStatus(test.vm)
+
+    checkK3sProcesses(test.vm)
+
   end
 
   config.vm.provision 'selinux-status', type: 'shell', run: 'once', inline: 'sestatus'

diff --git a/tests/install/fedora/Vagrantfile b/tests/install/fedora/Vagrantfile
@@ -10,6 +10,9 @@ Vagrant.configure("2") do |config|
   config.vm.boot_timeout = ENV['TEST_VM_BOOT_TIMEOUT'] || 600 # seconds
   config.vm.synced_folder '.', '/vagrant', disabled: true
 
+  # Load in helper functions
+  load "../install_util.rb"
+
   config.vm.define 'install-fedora', primary: true do |test|
     test.vm.hostname = 'smoke'
     test.vm.provision "disable-firewall", type: "shell", inline: "systemctl stop firewalld"
@@ -24,76 +27,22 @@ Vagrant.configure("2") do |config|
         selinux: true
         token: 'vagrant'
       YAML
-      k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321
-    end
-    test.vm.provision "k3s-wait-for-node", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
-      sh.env = { :PATH => "/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" }
-      sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        set -eu -o pipefail
-        echo 'Waiting for node to be ready ...'
-        time timeout 300 bash -c 'while ! (kubectl wait --for condition=ready node/$(hostname) 2>/dev/null); do sleep 5; done'
-        kubectl get node,all -A -o wide
-      SHELL
-    end
-    test.vm.provision "k3s-wait-for-coredns", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
-      sh.env = { :PATH => "/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" }
-      sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        set -eu -o pipefail
-        function describe-coredns {
-          RC=$?
-          if [[ $RC -ne 0 ]]; then
-            kubectl describe node
-            kubectl --namespace kube-system describe pod -l k8s-app=kube-dns
-            kubectl --namespace kube-system logs -l k8s-app=kube-dns
-          fi
-          exit $RC
-        }
-        trap describe-coredns EXIT
-        time timeout 300 bash -c 'while ! (kubectl --namespace kube-system rollout status --timeout 10s deploy/coredns 2>/dev/null); do sleep 5; done'
-      SHELL
-    end
-    test.vm.provision "k3s-wait-for-local-storage", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
-      sh.env = { :PATH => "/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" }
-      sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        set -eu -o pipefail
-        time timeout 300 bash -c 'while ! (kubectl --namespace kube-system rollout status --timeout 10s deploy/local-path-provisioner 2>/dev/null); do sleep 5; done'
-      SHELL
-    end
-    test.vm.provision "k3s-wait-for-metrics-server", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
-      sh.env = { :PATH => "/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" }
-      sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        set -eu -o pipefail
-        time timeout 300 bash -c 'while ! (kubectl --namespace kube-system rollout status --timeout 10s deploy/metrics-server 2>/dev/null); do sleep 5; done'
-      SHELL
-    end
-    test.vm.provision "k3s-wait-for-traefik", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
-      sh.env = { :PATH => "/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" }
-      sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        set -eu -o pipefail
-        time timeout 300 bash -c 'while ! (kubectl --namespace kube-system rollout status --timeout 10s deploy/traefik 2>/dev/null); do sleep 5; done'
-      SHELL
-    end
-    test.vm.provision "k3s-status", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
-      sh.env = { :PATH => "/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" }
-      sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        set -eux -o pipefail
-        kubectl get node,all -A -o wide
-      SHELL
-    end
-    test.vm.provision "k3s-procps", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
-      sh.env = { :PATH => "/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" }
-      sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        set -eux -o pipefail
-        ps auxZ | grep -E 'k3s|kube|container' | grep -v grep
-      SHELL
     end
+
+    waitForNodeReady(test.vm)
+
+    waitForCoreDns(test.vm)
+
+    waitForLocalStorage(test.vm)
+
+    waitForMetricsServer(test.vm)
+
+    waitForTraefik(test.vm)
+
+    kubectlStatus(test.vm)
+
+    checkK3sProcesses(test.vm)
+
   end
 
   config.vm.provision 'selinux-status', type: 'shell', run: 'once', inline: 'sestatus'

diff --git a/tests/install/opensuse-leap/Vagrantfile b/tests/install/opensuse-leap/Vagrantfile
@@ -10,6 +10,9 @@ Vagrant.configure("2") do |config|
   config.vm.boot_timeout = ENV['TEST_VM_BOOT_TIMEOUT'] || 600 # seconds
   config.vm.synced_folder '.', '/vagrant', disabled: true
 
+  # Load in helper functions
+  load "../install_util.rb"
+
   config.vm.define 'install-opensuse-leap', primary: true do |test|
     test.vm.hostname = 'smoke'
     test.vm.provision 'k3s-upload', type: 'file', run: 'always', source: ENV['TEST_INSTALL_SH'], destination: 'install.sh'
@@ -25,8 +28,8 @@ Vagrant.configure("2") do |config|
       k3s.config = <<~YAML
         token: 'vagrant'
       YAML
-      k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321
     end
+
     test.vm.provision "k3s-wait-for-node", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
       sh.env = { :PATH => "/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" }
       sh.inline = <<~SHELL
@@ -37,64 +40,19 @@ Vagrant.configure("2") do |config|
         kubectl get node,all -A -o wide
       SHELL
     end
-    test.vm.provision "k3s-wait-for-coredns", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
-      sh.env = { :PATH => "/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" }
-      sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        set -eu -o pipefail
-        function describe-coredns {
-          RC=$?
-          if [[ $RC -ne 0 ]]; then
-            kubectl describe node
-            kubectl --namespace kube-system describe pod -l k8s-app=kube-dns
-            kubectl --namespace kube-system logs -l k8s-app=kube-dns
-          fi
-          exit $RC
-        }
-        trap describe-coredns EXIT
-        timeout 300 bash -c 'while ! (kubectl --namespace kube-system rollout status --timeout 10s deploy/coredns); do sleep 5; done'
-      SHELL
-    end
-    test.vm.provision "k3s-wait-for-local-storage", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
-      sh.env = { :PATH => "/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" }
-      sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        set -eu -o pipefail
-        time timeout 300 bash -c 'while ! (kubectl --namespace kube-system rollout status --timeout 10s deploy/local-path-provisioner 2>/dev/null); do sleep 5; done'
-      SHELL
-    end
-    test.vm.provision "k3s-wait-for-metrics-server", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
-      sh.env = { :PATH => "/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" }
-      sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        set -eu -o pipefail
-        time timeout 300 bash -c 'while ! (kubectl --namespace kube-system rollout status --timeout 10s deploy/metrics-server 2>/dev/null); do sleep 5; done'
-      SHELL
-    end
-    test.vm.provision "k3s-wait-for-traefik", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
-      sh.env = { :PATH => "/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" }
-      sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        set -eu -o pipefail
-        time timeout 300 bash -c 'while ! (kubectl --namespace kube-system rollout status --timeout 10s deploy/traefik 2>/dev/null); do sleep 5; done'
-      SHELL
-    end
-    test.vm.provision "k3s-status", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
-      sh.env = { :PATH => "/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" }
-      sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        set -eux -o pipefail
-        kubectl get node,all -A -o wide
-      SHELL
-    end
-    test.vm.provision "k3s-procps", type: "shell", run: ENV['CI'] == 'true' ? 'never' : 'once' do |sh|
-      sh.env = { :PATH => "/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" }
-      sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        set -eux -o pipefail
-        ps auxZ | grep -E 'k3s|kube|container' | grep -v grep
-      SHELL
-    end
+
+    waitForCoreDns(test.vm)
+
+    waitForLocalStorage(test.vm)
+
+    waitForMetricsServer(test.vm)
+
+    waitForTraefik(test.vm)
+
+    kubectlStatus(test.vm)
+
+    checkK3sProcesses(test.vm)
+
   end
 
   %w[libvirt virtualbox vmware_desktop].each do |p|