Skip to content

Commit

Permalink
bump vagrant 2.3.7
Browse files Browse the repository at this point in the history
  • Loading branch information
yankay committed Jan 11, 2024
1 parent d6f688f commit e7587d1
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 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.2.19
VAGRANT_VERSION: 2.3.7
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 @@ -257,6 +257,7 @@ Vagrant.configure("2") do |config|
if i == $num_instances
node.vm.provision "ansible" do |ansible|
ansible.playbook = $playbook
ansible.compatibility_mode = "2.0"
ansible.verbose = $ansible_verbosity
$ansible_inventory_path = File.join( $inventory, "hosts.ini")
if File.exist?($ansible_inventory_path)
Expand Down
8 changes: 4 additions & 4 deletions pipeline.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG ARCH=amd64
ARG TZ=Etc/UTC
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

ENV VAGRANT_VERSION=2.2.19
ENV VAGRANT_VERSION=2.3.7
ENV VAGRANT_DEFAULT_PROVIDER=libvirt
ENV VAGRANT_ANSIBLE_TAGS=facts

Expand Down Expand Up @@ -41,9 +41,9 @@ RUN KUBE_VERSION=$(sed -n 's/^kube_version: //p' roles/kubespray-defaults/defaul
&& mv kubectl /usr/local/bin/kubectl

# Install Vagrant
RUN wget https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}_x86_64.deb && \
dpkg -i vagrant_${VAGRANT_VERSION}_x86_64.deb && \
rm vagrant_${VAGRANT_VERSION}_x86_64.deb && \
RUN wget https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}-1_amd64.deb && \
dpkg -i vagrant_${VAGRANT_VERSION}-1_amd64.deb && \
rm vagrant_${VAGRANT_VERSION}-1_amd64.deb && \
vagrant plugin install vagrant-libvirt

# Install Kubernetes collections
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.2.19
ENV VAGRANT_VERSION=2.3.7
ENV VAGRANT_DEFAULT_PROVIDER=libvirt
ENV VAGRANT_ANSIBLE_TAGS=facts

Expand Down

0 comments on commit e7587d1

Please sign in to comment.