fixup

Signed-off-by: Itxaka <igarcia@suse.com>
rancher · Nov 15, 2021 · 365f7b5 · 365f7b5
1 parent 0d66936
commit 365f7b5
Show file tree

Hide file tree

Showing 11 changed files with 107 additions and 23 deletions.
diff --git a/.github/build.yaml.gomplate b/.github/build.yaml.gomplate
@@ -324,6 +324,11 @@
           path: |
             packer/*.box
           if-no-files-found: error
+      - uses: actions/upload-artifact@v2
+        with:
+          name: cOS-Packer-{{{$subset}}}-{{{ $flavor }}}-vbox-{{{ $config.arch }}}.capture.zip
+          path: capture.webm
+          if-no-files-found: error
 {{{ end }}}
 
 {{{define "test"}}}
@@ -425,12 +430,12 @@
         if: failure()
         with:
           name: cOS-{{{$subset}}}-${{ matrix.test }}.serial.zip
-          path: tests/serial_port1
+          path: serial_port1.log
           if-no-files-found: warn
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-{{{$subset}}}-${{ matrix.test }}.capture.zip
-          path: tests/**/capture.webm
+          path: capture.webm
           if-no-files-found: warn
       {{{end}}}
 {{{ end }}}
@@ -765,6 +770,11 @@
           name: cOS-raw_disk_test_deploy-{{{ $flavor }}}.serial.zip
           path: serial_port1.log
           if-no-files-found: warn
+      - uses: actions/upload-artifact@v2
+        with:
+          name: cOS-raw_disk_test_deploy-{{{ $flavor }}}.capture.zip
+          path: capture.webm
+          if-no-files-found: warn
 {{{ end }}}
 
 {{{define "ami_publish"}}}

diff --git a/.github/workflows/build-master-green-x86_64.yaml b/.github/workflows/build-master-green-x86_64.yaml
@@ -295,6 +295,11 @@ jobs:
           path: |
             packer/*.box
           if-no-files-found: error
+      - uses: actions/upload-artifact@v2
+        with:
+          name: cOS-Packer-squashfs-green-vbox-x86_64.capture.zip
+          path: capture.webm
+          if-no-files-found: error
   tests-squashfs-green:
     env:
       ARCH: x86_64
@@ -337,12 +342,12 @@ jobs:
         if: failure()
         with:
           name: cOS-squashfs-${{ matrix.test }}.serial.zip
-          path: tests/serial_port1
+          path: serial_port1.log
           if-no-files-found: warn
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-squashfs-${{ matrix.test }}.capture.zip
-          path: tests/**/capture.webm
+          path: capture.webm
           if-no-files-found: warn
   iso-nonsquashfs-green:
     runs-on: ubuntu-latest
@@ -555,6 +560,11 @@ jobs:
           path: |
             packer/*.box
           if-no-files-found: error
+      - uses: actions/upload-artifact@v2
+        with:
+          name: cOS-Packer-nonsquashfs-green-vbox-x86_64.capture.zip
+          path: capture.webm
+          if-no-files-found: error
   tests-nonsquashfs-green:
     env:
       ARCH: x86_64
@@ -597,12 +607,12 @@ jobs:
         if: failure()
         with:
           name: cOS-nonsquashfs-${{ matrix.test }}.serial.zip
-          path: tests/serial_port1
+          path: serial_port1.log
           if-no-files-found: warn
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-nonsquashfs-${{ matrix.test }}.capture.zip
-          path: tests/**/capture.webm
+          path: capture.webm
           if-no-files-found: warn
   image-link-green:
     runs-on: ubuntu-latest
@@ -783,6 +793,11 @@ jobs:
           name: cOS-raw_disk_test_deploy-green.serial.zip
           path: serial_port1.log
           if-no-files-found: warn
+      - uses: actions/upload-artifact@v2
+        with:
+          name: cOS-raw_disk_test_deploy-green.capture.zip
+          path: capture.webm
+          if-no-files-found: warn
   build-toolchain-tagged:
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest

diff --git a/.github/workflows/build-nightly-blue-x86_64.yaml b/.github/workflows/build-nightly-blue-x86_64.yaml
@@ -173,3 +173,8 @@ jobs:
           name: cOS-raw_disk_test_deploy-blue.serial.zip
           path: serial_port1.log
           if-no-files-found: warn
+      - uses: actions/upload-artifact@v2
+        with:
+          name: cOS-raw_disk_test_deploy-blue.capture.zip
+          path: capture.webm
+          if-no-files-found: warn
diff --git a/.github/workflows/build-nightly-green-x86_64.yaml b/.github/workflows/build-nightly-green-x86_64.yaml
@@ -279,6 +279,11 @@ jobs:
           path: |
             packer/*.box
           if-no-files-found: error
+      - uses: actions/upload-artifact@v2
+        with:
+          name: cOS-Packer-squashfs-green-vbox-x86_64.capture.zip
+          path: capture.webm
+          if-no-files-found: error
   tests-squashfs-green:
     env:
       ARCH: x86_64
@@ -321,12 +326,12 @@ jobs:
         if: failure()
         with:
           name: cOS-squashfs-${{ matrix.test }}.serial.zip
-          path: tests/serial_port1
+          path: serial_port1.log
           if-no-files-found: warn
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-squashfs-${{ matrix.test }}.capture.zip
-          path: tests/**/capture.webm
+          path: capture.webm
           if-no-files-found: warn
   iso-nonsquashfs-green:
     runs-on: ubuntu-latest
@@ -539,6 +544,11 @@ jobs:
           path: |
             packer/*.box
           if-no-files-found: error
+      - uses: actions/upload-artifact@v2
+        with:
+          name: cOS-Packer-nonsquashfs-green-vbox-x86_64.capture.zip
+          path: capture.webm
+          if-no-files-found: error
   tests-nonsquashfs-green:
     env:
       ARCH: x86_64
@@ -581,12 +591,12 @@ jobs:
         if: failure()
         with:
           name: cOS-nonsquashfs-${{ matrix.test }}.serial.zip
-          path: tests/serial_port1
+          path: serial_port1.log
           if-no-files-found: warn
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-nonsquashfs-${{ matrix.test }}.capture.zip
-          path: tests/**/capture.webm
+          path: capture.webm
           if-no-files-found: warn
   raw-images-green:
     runs-on: ubuntu-latest
@@ -689,3 +699,8 @@ jobs:
           name: cOS-raw_disk_test_deploy-green.serial.zip
           path: serial_port1.log
           if-no-files-found: warn
+      - uses: actions/upload-artifact@v2
+        with:
+          name: cOS-raw_disk_test_deploy-green.capture.zip
+          path: capture.webm
+          if-no-files-found: warn
diff --git a/.github/workflows/build-nightly-orange-x86_64.yaml b/.github/workflows/build-nightly-orange-x86_64.yaml
@@ -173,3 +173,8 @@ jobs:
           name: cOS-raw_disk_test_deploy-orange.serial.zip
           path: serial_port1.log
           if-no-files-found: warn
+      - uses: actions/upload-artifact@v2
+        with:
+          name: cOS-raw_disk_test_deploy-orange.capture.zip
+          path: capture.webm
+          if-no-files-found: warn
diff --git a/.github/workflows/build-pr-green-x86_64.yaml b/.github/workflows/build-pr-green-x86_64.yaml
@@ -267,6 +267,11 @@ jobs:
           path: |
             packer/*.box
           if-no-files-found: error
+      - uses: actions/upload-artifact@v2
+        with:
+          name: cOS-Packer-squashfs-green-vbox-x86_64.capture.zip
+          path: capture.webm
+          if-no-files-found: error
   tests-squashfs-green:
     env:
       ARCH: x86_64
@@ -309,12 +314,12 @@ jobs:
         if: failure()
         with:
           name: cOS-squashfs-${{ matrix.test }}.serial.zip
-          path: tests/serial_port1
+          path: serial_port1.log
           if-no-files-found: warn
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-squashfs-${{ matrix.test }}.capture.zip
-          path: tests/**/capture.webm
+          path: capture.webm
           if-no-files-found: warn
   iso-nonsquashfs-green:
     runs-on: ubuntu-latest
@@ -527,6 +532,11 @@ jobs:
           path: |
             packer/*.box
           if-no-files-found: error
+      - uses: actions/upload-artifact@v2
+        with:
+          name: cOS-Packer-nonsquashfs-green-vbox-x86_64.capture.zip
+          path: capture.webm
+          if-no-files-found: error
   tests-nonsquashfs-green:
     env:
       ARCH: x86_64
@@ -569,12 +579,12 @@ jobs:
         if: failure()
         with:
           name: cOS-nonsquashfs-${{ matrix.test }}.serial.zip
-          path: tests/serial_port1
+          path: serial_port1.log
           if-no-files-found: warn
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-nonsquashfs-${{ matrix.test }}.capture.zip
-          path: tests/**/capture.webm
+          path: capture.webm
           if-no-files-found: warn
   raw-images-green:
     runs-on: ubuntu-latest
@@ -677,3 +687,8 @@ jobs:
           name: cOS-raw_disk_test_deploy-green.serial.zip
           path: serial_port1.log
           if-no-files-found: warn
+      - uses: actions/upload-artifact@v2
+        with:
+          name: cOS-raw_disk_test_deploy-green.capture.zip
+          path: capture.webm
+          if-no-files-found: warn
diff --git a/.github/workflows/build-releases-green-x86_64.yaml b/.github/workflows/build-releases-green-x86_64.yaml
@@ -295,6 +295,11 @@ jobs:
           path: |
             packer/*.box
           if-no-files-found: error
+      - uses: actions/upload-artifact@v2
+        with:
+          name: cOS-Packer-squashfs-green-vbox-x86_64.capture.zip
+          path: capture.webm
+          if-no-files-found: error
   tests-squashfs-green:
     env:
       ARCH: x86_64
@@ -337,12 +342,12 @@ jobs:
         if: failure()
         with:
           name: cOS-squashfs-${{ matrix.test }}.serial.zip
-          path: tests/serial_port1
+          path: serial_port1.log
           if-no-files-found: warn
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-squashfs-${{ matrix.test }}.capture.zip
-          path: tests/**/capture.webm
+          path: capture.webm
           if-no-files-found: warn
   iso-nonsquashfs-green:
     runs-on: ubuntu-latest
@@ -555,6 +560,11 @@ jobs:
           path: |
             packer/*.box
           if-no-files-found: error
+      - uses: actions/upload-artifact@v2
+        with:
+          name: cOS-Packer-nonsquashfs-green-vbox-x86_64.capture.zip
+          path: capture.webm
+          if-no-files-found: error
   tests-nonsquashfs-green:
     env:
       ARCH: x86_64
@@ -597,12 +607,12 @@ jobs:
         if: failure()
         with:
           name: cOS-nonsquashfs-${{ matrix.test }}.serial.zip
-          path: tests/serial_port1
+          path: serial_port1.log
           if-no-files-found: warn
       - uses: actions/upload-artifact@v2
         with:
           name: cOS-nonsquashfs-${{ matrix.test }}.capture.zip
-          path: tests/**/capture.webm
+          path: capture.webm
           if-no-files-found: warn
   image-link-green:
     runs-on: ubuntu-latest
@@ -865,6 +875,11 @@ jobs:
           name: cOS-raw_disk_test_deploy-green.serial.zip
           path: serial_port1.log
           if-no-files-found: warn
+      - uses: actions/upload-artifact@v2
+        with:
+          name: cOS-raw_disk_test_deploy-green.capture.zip
+          path: capture.webm
+          if-no-files-found: warn
   ami-publish-green:
     runs-on: ubuntu-latest
     needs: publish-vanilla-ami

diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,5 @@ packer/*.box
 packer/*.tar.gz
 packer/packer_cache/
 tests/**/logs
-tests/serial_port1
+serial_port1.log
+capture.webm
diff --git a/make/Makefile.test b/make/Makefile.test
@@ -138,7 +138,7 @@ else
 	# increase memory, otherwise grub fails to boot
 	VBoxManage modifyvm "test" --memory 10240 --cpus 3
 	# Record the machine screen
-	VBoxManage modifyvm "test" --recording on --recordingfile $(ROOT_DIR)/capture.webm
+	VBoxManage modifyvm "test" --recording on --recordingscreens 0 --recordingfile $(ROOT_DIR)/capture.webm
 	# config vm options, i.e. efi boot, nat, serial to file, etc...
 	VBoxManage modifyvm "test" --firmware efi --uart1 0x3f8 4 --uartmode1 file $(ROOT_DIR)/serial_port1.log --nic1 nat --boot1 disk --natpf1 "guestssh,tcp,,2222,,22"
 	# add sata controller
@@ -164,7 +164,7 @@ _create_vm_from_iso: $(VBOXMANAGE) $(ISO)
 	VBoxManage createmedium disk --filename sda.vdi --size 30000
 	VBoxManage createvm --name "test" --register
 	VBoxManage modifyvm "test" --memory 10240 --cpus 3
-	VBoxManage modifyvm "test" --recording on --recordingfile $(ROOT_DIR)/capture.webm
+	VBoxManage modifyvm "test" --recording on --recordingscreens 0 --recordingfile $(ROOT_DIR)/capture.webm
 	VBoxManage modifyvm "test" --uart1 0x3f8 4 --uartmode1 file $(ROOT_DIR)/serial_port1.log --nic1 nat --boot1 disk --boot2 dvd --natpf1 "guestssh,tcp,,2222,,22"
 	VBoxManage storagectl "test" --name "sata controller" --add sata --portcount 2
 	VBoxManage storageattach "test" --storagectl "sata controller" --port 0 --device 0 --type hdd --medium $(ROOT_DIR)/sda.vdi

diff --git a/packer/images.json.pkr.hcl b/packer/images.json.pkr.hcl
@@ -151,6 +151,9 @@ source "virtualbox-iso" "cos" {
   ssh_timeout            = "5m"
   ssh_username           = "${var.root_username}"
   vm_name                = "cOS"
+  vboxmanage = [
+    ["modifyvm", "{{.Name}}", "--recording", "on", "--recordingscreens", "0","--recordingfile", "../capture.webm"],
+  ]
 }
 
 build {

diff --git a/tests/Vagrantfile b/tests/Vagrantfile
@@ -20,8 +20,8 @@ Vagrant.configure("2") do |config|
             vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
             # Enable serial output to file
             vb.customize ["modifyvm", :id, "--uart1", "0x3f8", "4"]
-            vb.customize ["modifyvm", :id, "--uartmode1", "file", "./serial_port1"]
-            vb.customize ["modifyvm", :id, "--recording", "on", "--recordingfile", "./record.webm"]
+            vb.customize ["modifyvm", :id, "--uartmode1", "file", "../serial_port1.log"]
+            vb.customize ["modifyvm", :id, "--recording", "on", "--recordingscreens", "0","--recordingfile", "../capture.webm"]
         end
     end