Kay Yan
10 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
9 additions and
8 deletions
-
.gitlab-ci/lint.yml
-
Vagrantfile
-
pipeline.Dockerfile
-
test-infra/vagrant-docker/Dockerfile
-
tests/scripts/vagrant-validate.sh
|
|
@ -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'] |
|
|
|
|
|
@ -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) |
|
|
|
|
|
@ -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 |
|
|
|
|
|
|
@ -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 |
|
|
|
|
|
@ -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 |
|
|
|
|
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
#!/bin/bash |
|
|
|
set -euxo pipefail |
|
|
|
|
|
|
|
curl -sL "https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}_x86_64.deb" -o "/tmp/vagrant_${VAGRANT_VERSION}_x86_64.deb" |
|
|
|
dpkg -i "/tmp/vagrant_${VAGRANT_VERSION}_x86_64.deb" |
|
|
|
curl -sL "https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}-1_amd64.deb" -o "/tmp/vagrant_${VAGRANT_VERSION}-1_amd64.deb" |
|
|
|
dpkg -i "/tmp/vagrant_${VAGRANT_VERSION}-1_amd64.deb" |
|
|
|
vagrant validate --ignore-provider |