Merge branch '8.12' into fix/olm-unskip_e2e_edr_workflows_failing_tests

elastic · Jan 29, 2024 · aff85f6 · aff85f6
2 parents ea7571e + 0b4ecdb
commit aff85f6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/test/package/roles/install_kibana_deb/tasks/main.yml b/test/package/roles/install_kibana_deb/tasks/main.yml
@@ -6,6 +6,7 @@
       - fonts-liberation
       - libfontconfig
     state: latest
+    cache_valid_time: 3600
 
 - name: find deb package
   find:

diff --git a/...ion/public/management/cypress/e2e/response_actions/response_console/file_operations.cy.ts b/...ion/public/management/cypress/e2e/response_actions/response_console/file_operations.cy.ts
@@ -112,7 +112,7 @@ describe('Response console', { tags: ['@ess', '@serverless'] }, () => {
         path: `${homeFilePath}/upload.zip`,
         password: 'elastic',
       }).then((unzippedFileContent) => {
-        expect(unzippedFileContent).to.equal(fileContent);
+        expect(unzippedFileContent).to.contain(fileContent);
       });
     });
 

diff --git a/x-pack/plugins/security_solution/scripts/endpoint/common/vagrant/Vagrantfile b/x-pack/plugins/security_solution/scripts/endpoint/common/vagrant/Vagrantfile
@@ -32,5 +32,7 @@ Vagrant.configure("2") do |config|
   config.vm.provision "file", source: cachedAgentSource, destination: "~/#{cachedAgentFilename}"
   config.vm.provision "shell", inline: "mkdir #{agentDestinationFolder}"
   config.vm.provision "shell", inline: "tar -zxf #{cachedAgentFilename} --directory #{agentDestinationFolder} --strip-components=1 && rm -f #{cachedAgentFilename}"
+  config.vm.provision "shell", inline: "sudo apt-get update"
+  config.vm.provision "shell", inline: "sudo apt-get upgrade"
   config.vm.provision "shell", inline: "sudo apt-get install unzip"
 end