cicd: Cypress upgrade
This commit is contained in:
parent
6d27c3db11
commit
7dbc077f76
|
|
@ -13,19 +13,19 @@ Vagrant.configure("2") do |config|
|
||||||
|
|
||||||
config.vm.define :f36 do |f36|
|
config.vm.define :f36 do |f36|
|
||||||
f36.vm.box = "generic/fedora36"
|
f36.vm.box = "generic/fedora36"
|
||||||
f36.vm.provision "file", source: "/opt/OliveTin-vagrant/linux_amd64_rpm/.", destination: "."
|
f36.vm.provision "file", source: "/opt/OliveTin-snapshot/OliveTin_linux_amd64.rpm", destination: "$HOME/"
|
||||||
f36.vm.provision "shell", inline: "rpm -U OliveTin* && systemctl enable --now OliveTin && systemctl disable --now firewalld"
|
f36.vm.provision "shell", inline: "rpm -U OliveTin* && systemctl enable --now OliveTin && systemctl disable --now firewalld"
|
||||||
end
|
end
|
||||||
|
|
||||||
config.vm.define :debian do |debian|
|
config.vm.define :debian do |debian|
|
||||||
debian.vm.box = "generic/debian10"
|
debian.vm.box = "generic/debian10"
|
||||||
debian.vm.provision "file", source: "/opt/OliveTin-vagrant/linux_amd64_deb/.", destination: "."
|
debian.vm.provision "file", source: "/opt/OliveTin-snapshot/OliveTin_linux_amd64.deb", destination: "$HOME/"
|
||||||
debian.vm.provision "shell", inline: "dpkg --force-confold -i OliveTin* && systemctl enable --now OliveTin"
|
debian.vm.provision "shell", inline: "dpkg --force-confold -i OliveTin* && systemctl enable --now OliveTin"
|
||||||
end
|
end
|
||||||
|
|
||||||
config.vm.define :ubuntu do |ubuntu|
|
config.vm.define :ubuntu do |ubuntu|
|
||||||
ubuntu.vm.box = "generic/ubuntu2110"
|
ubuntu.vm.box = "generic/ubuntu2110"
|
||||||
ubuntu.vm.provision "file", source: "/opt/OliveTin-vagrant/linux_amd64_deb/.", destination: "."
|
ubuntu.vm.provision "file", source: "/opt/OliveTin-snapshot/OliveTin_linux_amd64.deb", destination: "$HOME/"
|
||||||
ubuntu.vm.provision "shell", inline: "dpkg --force-confold -i OliveTin* && systemctl enable --now OliveTin && systemctl disable --now firewalld"
|
ubuntu.vm.provision "shell", inline: "dpkg --force-confold -i OliveTin* && systemctl enable --now OliveTin && systemctl disable --now firewalld"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
const { defineConfig } = require('cypress')
|
||||||
|
|
||||||
|
module.exports = defineConfig({
|
||||||
|
screenshotsFolder: 'results/screenshots/',
|
||||||
|
videosFolder: 'results/videos/',
|
||||||
|
e2e: {
|
||||||
|
// We've imported your old cypress plugins here.
|
||||||
|
// You may want to clean this up later by importing these.
|
||||||
|
setupNodeEvents(on, config) {
|
||||||
|
return require('./cypress/plugins/index.js')(on, config)
|
||||||
|
},
|
||||||
|
baseUrl: 'http://localhost:1337',
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
{
|
|
||||||
"baseUrl": "http://localhost:1337",
|
|
||||||
"screenshotsFolder": "results/screenshots/",
|
|
||||||
"videosFolder": "results/videos/"
|
|
||||||
}
|
|
||||||
|
|
@ -9,4 +9,4 @@ BASE_URL="http://$IP:1337/"
|
||||||
echo "IP: $IP, BaseURL: $BASE_URL"
|
echo "IP: $IP, BaseURL: $BASE_URL"
|
||||||
|
|
||||||
# Only run the general test, as we cannot easily switch out configs in VMs yet.
|
# Only run the general test, as we cannot easily switch out configs in VMs yet.
|
||||||
./node_modules/.bin/cypress run --headless -c baseUrl=$BASE_URL -s cypress/integration/general/*
|
./node_modules/.bin/cypress run --headless -c baseUrl=$BASE_URL -s cypress/e2e/general/*
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -9,7 +9,7 @@
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"devDependencies": {
|
||||||
"cypress": "^8.3.0"
|
"cypress": "^12.17.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue