diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c870afa09c82873fd9a86aa539c6377f818ee51..9ba1a7b96e5adf1d5a09d66805ac4ebd5cd5168c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ Upcoming version: ----------------- + - fixed syntax error in Vagrantfile (Nikolaus Krismer) - preparations to use libvirt on dbis-ci test system (Nikolaus Krismer) - preparations to use libvirt on dbis-ci test system (Nikolaus Krismer) - merging (Nikolaus Krismer) diff --git a/Vagrantfile b/Vagrantfile index d056ffba31f7933957d8faecbd0be3714af54524..75bc1dd2225fe9c09f89077aec53d641fcca017a 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -91,7 +91,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.synced_folder "log/bootstrap", "/var/log/vagrant_bootstrap", create: true, owner: "vagrant", group: "vagrant" # Setup environment on startup (done using a shell script) - config.vm.provision "shell", keep_color: true, path: "bootstrap/prepareEnvironment.sh", args: ["secretPhdPassword#2014!", (isLocalDeploy ? "true" : "false"), (isJenki$ + config.vm.provision "shell", keep_color: true, path: "bootstrap/prepareEnvironment.sh", args: ["secretPhdPassword#2014!", (isLocalDeploy ? "true" : "false"), (isJenkinsDeploy ? "true" : "false")] config.vm.provision "shell", keep_color: true, path: "bootstrap/createDatabase.sh", args: ["niko", "secretPhdPassword#2014!"] config.vm.provision "shell", keep_color: true, path: "bootstrap/importData.sh", args: ["niko", "secretPhdPassword#2014!", (deployAllDatasets ? "true" : "false")] # Optionally activate database logging (for queryTimeLogging this is done in the testcase itself now)