Skip to content

Commit

Permalink
Bump vagrant version
Browse files Browse the repository at this point in the history
Otherwise we get spurious dependencies errors when installing libvirt
plugin
Set the vagrant ansible compatibility mode explicitely otherwise vagrant
use incorrect ansible flags (version detection fails somehow...)
  • Loading branch information
VannTen committed Jan 8, 2024
1 parent 662e2fb commit 6dc58c5
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ vagrant-validate:
stage: unit-tests
tags: [light]
variables:
VAGRANT_VERSION: 2.3.4
VAGRANT_VERSION: 2.4.0
script:
- ./tests/scripts/vagrant-validate.sh
except: ['triggers', 'master']
Expand Down
1 change: 1 addition & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ Vagrant.configure("2") do |config|
# And limit the action to gathering facts, the full playbook is going to be ran by testcases_run.sh
if i == $num_instances
node.vm.provision "ansible" do |ansible|
ansible.compatibility_mode = "2.0"
ansible.playbook = $playbook
ansible.verbose = $ansible_verbosity
$ansible_inventory_path = File.join( $inventory, "hosts.ini")
Expand Down
2 changes: 1 addition & 1 deletion pipeline.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM ubuntu:jammy-20230308
# Pip needs this as well at the moment to install ansible
# (and potentially other packages)
# See: https://github.com/pypa/pip/issues/10219
ENV VAGRANT_VERSION=2.3.4 \
ENV VAGRANT_VERSION=2.4.0 \
VAGRANT_DEFAULT_PROVIDER=libvirt \
VAGRANT_ANSIBLE_TAGS=facts \
LANG=C.UTF-8 \
Expand Down
2 changes: 1 addition & 1 deletion test-infra/vagrant-docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
ARG KUBESPRAY_VERSION
FROM quay.io/kubespray/kubespray:${KUBESPRAY_VERSION}

ENV VAGRANT_VERSION=2.3.4
ENV VAGRANT_VERSION=2.4.0
ENV VAGRANT_DEFAULT_PROVIDER=libvirt
ENV VAGRANT_ANSIBLE_TAGS=facts

Expand Down

0 comments on commit 6dc58c5

Please sign in to comment.