mirror/XenOrchestraInstallerUpdater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix test vagrantfiles and create missing xo-builds directory in xo-install.sh for new installations

Browse Source
This commit is contained in:
ronivay
2018-11-15 18:11:01 +02:00
parent f3321ba90b
commit f588105e06
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/CentOS/Vagrantfile vendored
View File

@@ -43,6 +43,6 @@ Vagrant.configure(2) do |config|
# #
# Run automated test installation # Run automated test installation
# #
config.vm.provision "install", type: "shell", path: "../../xo-install.sh", args: "--install", run: "never" config.vm.provision "install", type: "shell", inline: "/vagrant/xo-install.sh --install", run: "never"
config.vm.provision "update", type: "shell", path: "../../xo-install.sh", args: "--update", run: "never" config.vm.provision "update", type: "shell", inline: "/vagrant/xo-install.sh --update", run: "never"
end end

4
tests/Debian/Vagrantfile vendored
View File

@@ -43,6 +43,6 @@ Vagrant.configure(2) do |config|
# #
# Run automated test installation # Run automated test installation
# #
config.vm.provision "install", type: "shell", path: "../../xo-install.sh", args: "--install", run: "never" config.vm.provision "install", type: "shell", inline: "/vagrant/xo-install.sh --install", run: "never"
config.vm.provision "update", type: "shell", path: "../../xo-install.sh", args: "--update", run: "never" config.vm.provision "update", type: "shell", inline: "/vagrant/xo-install.sh --update", run: "never"
end end

4
tests/Ubuntu/Vagrantfile vendored
View File

@@ -43,6 +43,6 @@ Vagrant.configure(2) do |config|
# #
# Run automated test installation # Run automated test installation
# #
config.vm.provision "install", type: "shell", path: "../../xo-install.sh", args: "--install", run: "never" config.vm.provision "install", type: "shell", inline: "/vagrant/xo-install.sh --install", run: "never"
config.vm.provision "update", type: "shell", path: "../../xo-install.sh", args: "--update", run: "never" config.vm.provision "update", type: "shell", inline: "/vagrant/xo-install.sh --update", run: "never"
end end

6
xo-install.sh
View File

@@ -263,6 +263,12 @@ function InstallXO {
mkdir -p "$INSTALLDIR" mkdir -p "$INSTALLDIR"
fi fi
# Create missing xo-builds directory if doesn't exist already
if [[ ! -d "$INSTALLDIR/xo-builds" ]]; then
echo "Creating missing xo-builds directory to $INSTALLDIR/xo-builds"
mkdir "$INSTALLDIR/xo-builds"
fi
echo echo
echo "Fetching Xen Orchestra source code ..." echo "Fetching Xen Orchestra source code ..."
echo echo