#1197 Use Fedora 29 when developing with Vagrant
Merged 5 years ago by mprahl. Opened 5 years ago by mprahl.

file modified
+6 -8
@@ -28,13 +28,13 @@ 

          python-qpid \

          python-solv \

          python-sqlalchemy \

-         python-virtualenv \

          python-futures \

          python2-pungi \

          python3 \

          python3-devel \

          python3-docutils \

          python3-pungi \

+         python3-virtualenv \

          redhat-rpm-config \

          redhat-rpm-config \

          rpm-build \
@@ -61,10 +61,10 @@ 

  

    test -e $env_dir && rm -rf $env_dir

  

-   # solv is not availabe from pypi.org. libsolve has to be installed by dnf.

-   (cd; virtualenv --system-site-packages devenv)

+   # solv is not availabe from pypi.org. libsolv has to be installed by dnf.

+   (cd; virtualenv -p python2 --system-site-packages devenv)

  

-   $pip install --upgrade pip

+   $pip install --upgrade pip kobo

    $pip install -r $code_dir/test-requirements.txt

    $pip install ipython

  
@@ -91,7 +91,7 @@ 

  SCRIPT_SERVICES

  

  Vagrant.configure("2") do |config|

-   config.vm.box = "fedora/27-cloud-base"

+   config.vm.box = "fedora/29-cloud-base"

    config.vm.synced_folder "./", "/opt/module_build_service"

    # Disable the default share

    config.vm.synced_folder ".", "/vagrant", disabled: true
@@ -102,12 +102,10 @@ 

    config.vm.provision "shell", inline: $make_devenv, privileged: false

    config.vm.provision "shell", inline: $script_services, privileged: false, run: "always"

    config.vm.provider "libvirt" do |v, override|

-     override.vm.synced_folder "./", "/opt/module_build_service", type: "sshfs", sshfs_opts_append: "-o nonempty"

+     override.vm.synced_folder "./", "/opt/module_build_service", type: "sshfs"

      v.memory = 1024

-     #v.cpus = 2
yashn commented 5 years ago

Just out of curiosity, can I ask the reason for removing this line?

It was just a commented out configuration that didn't affect anything

    end

    config.vm.provider "virtualbox" do |v|

      v.memory = 1024

-     #v.cpus = 2

    end

  end

In general, the Vagrantfile needs more cleanup such as installing all the dependencies we can from RPMs and then use PyPi for the remainder, but this is good enough to get Fedora 29 working.

rebased onto 63bccb2

5 years ago

Just out of curiosity, can I ask the reason for removing this line?

It was just a commented out configuration that didn't affect anything

Pull-Request has been merged by mprahl

5 years ago