From e06d174155e199cefdefd6f3edbbb4116e39591a Mon Sep 17 00:00:00 2001
From: Giulia Naponiello <gnaponie@redhat.com>
Date: Feb 18 2019 15:38:36 +0000
Subject: Switch to fedora-29 in the Jenkinsfile


---

diff --git a/Dockerfile b/Dockerfile
index 9e1d2fa..2a1d61a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:28
+FROM fedora:29
 LABEL \
     name="Greenwave application" \
     vendor="Greenwave developers" \
diff --git a/Jenkinsfile b/Jenkinsfile
index 41a89ab..c778c62 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -51,7 +51,7 @@ node('master'){
 }
 
 timestamps {
-node('fedora-28') {
+node('fedora-29') {
     checkout scm
     scmVars.GIT_AUTHOR_EMAIL = sh (
         script: 'git --no-pager show -s --format=\'%ae\'',
@@ -167,7 +167,7 @@ node('docker') {
     }
 }
 
-node('fedora-28') {
+node('fedora-29') {
     checkout scm
 
     /* Install packages needed by the functional tests. */
diff --git a/Vagrantfile b/Vagrantfile
index 6de66aa..7302e46 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -50,7 +50,7 @@ $make_devenv = <<DEVENV
 DEVENV
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "fedora/28-cloud-base"
+  config.vm.box = "fedora/29-cloud-base"
   config.vm.synced_folder "./", "/opt/greenwave"
   # Disable the default share
   config.vm.synced_folder ".", "/vagrant", disabled: true
@@ -59,7 +59,7 @@ Vagrant.configure("2") do |config|
   config.vm.provision "shell", inline: $make_devenv, privileged: false
   config.vm.provider "libvirt" do |v, override|
     # If libvirt is being used, use sshfs for bidirectional folder syncing
-    override.vm.synced_folder "./", "/opt/greenwave", type: "sshfs", sshfs_opts_append: "-o nonempty"
+    override.vm.synced_folder "./", "/opt/greenwave", type: "sshfs"
     v.memory = 1024
   end
   config.vm.provider "virtualbox" do |v|