.github/workflows/basic.yaml

@@ -13,13 +13,13 @@ jobs:
         os: [ ubuntu-22.04 ]
     steps:
     - name: Install Go
-      uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+      uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
       with:
         # renovate: datasource=golang-version depName=go
-        go-version: 1.20.6
+        go-version: 1.21.4
 
     - name: Checkout code
-      uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       with:
         path: src/little-vm-helper
 

.github/workflows/example.yaml

@@ -15,10 +15,10 @@ jobs:
         os: [ ubuntu-22.04 ]
     steps:
     - name: Install Go
-      uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+      uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
       with:
         # renovate: datasource=golang-version depName=go
-        go-version: 1.20.6
+        go-version: 1.21.4
 
     - name: Install dependencies
       run: |
@@ -28,7 +28,7 @@ jobs:
         sudo apt-get -qy install mmdebstrap libguestfs-tools qemu-utils extlinux git fakeroot build-essential xz-utils libssl-dev bc flex libelf-dev bison pahole
 
     - name: Checkout code
-      uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       with:
         path: src/little-vm-helper
 

.github/workflows/quay.yaml

@@ -10,13 +10,13 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - name: Install Go
-      uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+      uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
       with:
         # renovate: datasource=golang-version depName=go
-        go-version: 1.20.6
+        go-version: 1.21.4
 
     - name: Checkout code
-      uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       with:
         fetch-depth: 0
 

README.md

@@ -2,7 +2,7 @@
 
 little-vm-helper (lvh) is a VM management tool, aimed for testing and development of features that
 depend on the kernel, such as BPF. It is used in [cilium](https://github.com/cilium/cilium),
-[tetragon](https://github.com/cilium/teragon), and [pwru](https://github.com/cilium/pwru). It can also be used for kernel development. It is not
+[tetragon](https://github.com/cilium/tetragon), and [pwru](https://github.com/cilium/pwru). It can also be used for kernel development. It is not
 meant, and should not be used for running production VMs. Fast booting and image building, as well
 as being storage efficient are the main goals.
 

action.yaml

@@ -16,7 +16,7 @@ inputs:
     description: 'LVH cli version (Docker tag)'
     required: true
     # renovate: datasource=github-tags depName=cilium/little-vm-helper
-    default: 'v0.0.11'
+    default: 'v0.0.12'
   cmd:
     description: 'Commands to run in a VM (any occurance of "$" within "cmd" must be escaped)'
     required: true
@@ -47,9 +47,6 @@ inputs:
     description: 'Provision VM (if set to false, only given test cmd is going to be run)'
     required: true
     default: 'true'
-  dns-resolver:
-    description: 'Set DNS resolver in /etc/resolv.conf of a VM'
-    required: false
   install-dependencies:
     description: 'Install QEMU dependencies (Debian/Ubuntu)'
     default: 'false'
@@ -76,6 +73,9 @@ inputs:
     description: 'Run in verbose mode'
     required: true
     default: 'false'
+  port-forward:
+    description: 'Additional to SSH port forward ($LOCAL:$VM_PORT)'
+    required: false
 runs:
   using: "composite"
   steps:
@@ -108,7 +108,7 @@ runs:
 
     - name: Load install packages from GitHub cache
       if: ${{ inputs.provision == 'true' && inputs.install-dependencies == 'true' }}
-      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
       id: package-cache
       with:
         path: /tmp/.ubuntu-pkgs
@@ -125,7 +125,7 @@ runs:
           sudo apt-get clean && \
           sudo apt-get -d -y --no-install-recommends install ${{steps.find-lvh-cli.outputs.dependency_list}} && \
           break || success=0
-          n=$((n+1)) 
+          n=$((n+1))
           sleep 1
         done
         [ $success -eq 1 ] || exit 42
@@ -142,7 +142,7 @@ runs:
         sudo apt-get -y --no-install-recommends install /tmp/.ubuntu-pkgs/*.deb
         sudo kvm-ok
 
-    - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+    - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
       if: ${{ inputs.provision == 'true' }}
       id: cache-lvh-image
       with:
@@ -153,7 +153,7 @@ runs:
       if: ${{ inputs.provision == 'true' }}
       id: derive-image-name
       shell: bash
-      run: echo "image-name=${{ inputs.image }}_$(echo ${{ inputs.image-version }} | sed 's/\(.*\)\-\(.*\)/\1/g')" >> $GITHUB_OUTPUT
+      run: echo "image-name=$(echo ${{ inputs.image }} | sed 's/\-ci//g')_$(echo ${{ inputs.image-version }} | sed 's/\(.*\)\-\(.*\)/\1/g')" >> $GITHUB_OUTPUT
 
     - name: Fetch VM image
       if: ${{ inputs.provision == 'true' && steps.cache-lvh-image.outputs.cache-hit != 'true' }}
@@ -180,6 +180,9 @@ runs:
         if [ "${{ inputs.verbose }}" == "true" ]; then
           extraArgs+=("--verbose")
         fi
+        if [ "${{ inputs.port-forward }}" != "" ]; then
+          extraArgs+=("-p" "${{ inputs.port-forward }}")
+        fi
         sudo touch /tmp/console.log
         sudo /bin/lvh run --host-mount=${{ inputs.host-mount }} --image /_images/${{ inputs.test-name }}.qcow2 \
             --daemonize -p ${{ inputs.ssh-port }}:22 --serial-port ${{ inputs.serial-port }} \
@@ -192,10 +195,10 @@ runs:
       shell: bash
       run: |
         n=0
-        started=1
+        started=0
         until [ "$n" -ge ${{ inputs.ssh-startup-wait-retries }} ]; do
           if grep -E ".*OK.*Started.*ssh.*" /tmp/console.log; then
-            started=0
+            started=1
             break
           elif grep -E ".*FAILED.*Failed.*to.*start.*ssh*" /tmp/console.log; then
             cat /tmp/console.log
@@ -204,35 +207,26 @@ runs:
           n=$((n+1))
           sleep ${{ inputs.ssh-startup-wait-timeout }}
         done
-        if [ $started -eq 1 ]; then
+        if [ $started -eq 0 ]; then
           cat /tmp/console.log
           exit 41
         fi
-        
+
         n=0
-        success=1
+        success=0
         until [ "$n" -ge ${{ inputs.ssh-connect-wait-retries }} ]; do
           if ssh -p ${{ inputs.ssh-port }} -o "StrictHostKeyChecking=no" root@localhost exit; then
-            success=0
-            break        
+            success=1
+            break
           fi
           n=$((n+1))
           sleep ${{ inputs.ssh-connect-wait-timeout }}
         done
-        if [ $success -eq 1 ]; then
+        if [ $success -eq 0 ]; then
           cat /tmp/console.log
           exit 42
         fi
 
-    - name: Set DNS resolver
-      if: ${{ inputs.provision == 'true' && inputs.dns-resolver != '' }}
-      shell: bash
-      run: |
-        ssh -p ${{ inputs.ssh-port }} -o "StrictHostKeyChecking=no" root@localhost << EOF
-        set -e
-        echo "nameserver ${{ inputs.dns-resolver }}" > /etc/resolv.conf
-        EOF
-
     - name: Run test cmd in VM
       shell: bash
       run: |

go.mod

@@ -1,41 +1,40 @@
 module github.com/cilium/little-vm-helper
 
-go 1.18
+go 1.20
 
 require (
-	github.com/go-git/go-git/v5 v5.7.0
-	github.com/hashicorp/go-multierror v1.1.1
-	github.com/hashicorp/packer-plugin-sdk v0.4.0
+	github.com/go-git/go-git/v5 v5.10.0
 	github.com/sirupsen/logrus v1.9.3
-	github.com/spf13/cobra v1.7.0
+	github.com/spf13/cobra v1.8.0
 	github.com/stretchr/testify v1.8.4
-	golang.org/x/sys v0.10.0
+	golang.org/x/sys v0.14.0
 )
 
 require (
-	github.com/Microsoft/go-winio v0.5.2 // indirect
-	github.com/ProtonMail/go-crypto v0.0.0-20230518184743-7afd39499903 // indirect
+	dario.cat/mergo v1.0.0 // indirect
+	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
 	github.com/acomagu/bufpipe v1.0.4 // indirect
 	github.com/cloudflare/circl v1.3.3 // indirect
+	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
-	github.com/go-git/go-billy/v5 v5.4.1 // indirect
+	github.com/go-git/go-billy/v5 v5.5.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/imdario/mergo v0.3.15 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
-	github.com/kr/pretty v0.3.0 // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/sergi/go-diff v1.1.0 // indirect
-	github.com/skeema/knownhosts v1.1.1 // indirect
+	github.com/skeema/knownhosts v1.2.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
-	golang.org/x/crypto v0.9.0 // indirect
-	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/mod v0.12.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/tools v0.13.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )